Until you run out of leg room

I saw that you wrote here (I don’t remember exactly where it was), that nowadays the leg of a bride is removed from the market much later and therefore it is possible to light it later in the first place. My question is whether you also take this as the second excuse of the Gemara (according to Rashi’s understanding). That is, when the Gemara says that the expression is said regarding the amount of oil needed, you actually need an amount of oil that will last for about 4 hours (or maybe even more)? I can think of another reason and I assume there are more, the question is actually how far you take your argument.