Cleanup: Minor style fixes

Bits and bobs cherry-picked from older master commits lost in the logs