Fix comments from clang 5.0 patch