Mostly comment cleanup.