Fix codestyle, whitespace and Good-Code-Patterns™
Affects 7e716bc5a2f and 7d22bce16e7