Bugfixes cleanups

In that case it _really_ needs an explanatory comment, as it shows I still don't understand the line. I thought they were alternatives!