diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 2ec3f16..e41f7e6 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -476,7 +476,8 @@
       ? cls->FindDeclaredDirectMethod(method_name, signature, image_size)
       : cls->FindDeclaredVirtualMethod(method_name, signature, image_size);
   if (method == nullptr) {
-    LOG(FATAL) << "Could not find method of intrinsic " << class_name << method_name << signature;
+    LOG(FATAL) << "Could not find method of intrinsic "
+               << class_name << " " << method_name << " " << signature;
   }
   DCHECK_EQ(method->GetInvokeType(), invoke_type);
   method->SetIntrinsic(static_cast<uint32_t>(intrinsic));
@@ -501,11 +502,13 @@
     // those compilations will pick up a boot image that have the ArtMethod already
     // set with the intrinsics flag.
     ScopedObjectAccess soa(Thread::Current());
-#define OPTIMIZING_INTRINSICS(Name, InvokeType, NeedsEnvironmentOrCache, SideEffects, Exceptions, ClassName, MethodName, Signature) \
+#define SETUP_INTRINSICS(Name, InvokeType, NeedsEnvironmentOrCache, SideEffects, Exceptions, \
+                         ClassName, MethodName, Signature) \
   SetupIntrinsic(soa.Self(), Intrinsics::k##Name, InvokeType, ClassName, MethodName, Signature);
 #include "intrinsics_list.h"
-INTRINSICS_LIST(OPTIMIZING_INTRINSICS)
+INTRINSICS_LIST(SETUP_INTRINSICS)
 #undef INTRINSICS_LIST
+#undef SETUP_INTRINSICS
   }
   // Compile:
   // 1) Compile all classes and methods enabled for compilation. May fall back to dex-to-dex
diff --git a/compiler/intrinsics_list.h b/compiler/intrinsics_list.h
index 5877f57..b617387 100644
--- a/compiler/intrinsics_list.h
+++ b/compiler/intrinsics_list.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C, "", "", "") 2015 The Android Open Source Project
+ * Copyright (C) 2015 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License", "", "", "");
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *