diff --git a/.gitignore b/.gitignore
index 6c34e37..834dfaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@
 # Directories to ignore (do not add trailing '/'s, they skip symlinks).
 #==============================================================================#
 # Clang extra user tools, which is tracked independently (clang-tools-extra).
-tools/extra
+# tools/extra [alexfh] I want this locally
 # Sphinx build products
 docs/_build
 docs/analyzer/_build
diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index c564653..7ebf3e0 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -264,9 +264,9 @@
     return false;
   }
   case tok::char_constant:          // 'x'
-  case tok::wide_char_constant: {   // L'x'
+  case tok::wide_char_constant:     // L'x'
   case tok::utf16_char_constant:    // u'x'
-  case tok::utf32_char_constant:    // U'x'
+  case tok::utf32_char_constant: {  // U'x'
     // Complain about, and drop, any ud-suffix.
     if (PeekTok.hasUDSuffix())
       PP.Diag(PeekTok, diag::err_pp_invalid_udl) << /*character*/0;