Comment tidy-up.