Coding style fixes
This merge request is where I'm staging coding style fixes for problems I inadvertently introduced in !235 (merged)
This merge request is where I'm staging coding style fixes for problems I inadvertently introduced in !235 (merged)