Mostly style cleanups and commentary.