Minor code cleanup and review.

There should be no functional changes.