MDL-23692 forgotpw: Coding style tidyups.