[#858] Small whitespace tweaks