Make it clang-friendly. Fix comments.