clang-format-3.5 more compatibility issues.