WINTERMUTE: Even more formatting fixes.