Hello,

I've attached my patch V2.

This restores some more of the original logic that I have now realized
was indeed necessary.  Again, this patch should not actually change
anything with respect to program logic, flow, or user experience.  In my
limited testing, it seems to act just as it did before (but
significantly more performant).