#5021: Comments rewrite.