A bunch of CODING_GUIDELINES related fixes. Not even close to done.