A bunch of formatting/syntax cleanups.