More code style fixes that suddenly are needed once you clean up. Sigh.