COMMON: Enforce formatting guidelines a bit more in util.h.