Please the lint-happy

.. Fixed whatever caused my eyes to cry when opening in a editor that
actually cares about the code.