Kudos for @Recursive and @andersw.
The bugfixes of @andersw are a great example of a single change in code can have multiple unforeseen effects. Kinda like a cyber butterfly effect.
Something to keep in mind when requesting general code changes to meet a personal playstyle.
I just pointed to where they were mentioned, Im not involved in the code at all.