Lots of small (mostly stylistic) code changes.