The changes in this PR were not changes I originally intended to do. This was one of the points where I had to stop improving things in order to finish this change at all.

I agree we should fix this, but I couldn't do it now and I think things still get better.