First batch of indent-aided code cleanups, more will follow.