More formatting and consistency fixes

Wouldn't do those either (same reason as for the one in CommonFuncs.h)