Some more code and comments clean-up.