Various microimprovements.

Comments, variable renaming, other local refactoring.