Fixup comments after review.

Thanks to Dominik Honnef for taking the time to review this code.