diff --git a/aidl_checkapi.cpp b/aidl_checkapi.cpp
index 3c9654a..9d9387c 100644
--- a/aidl_checkapi.cpp
+++ b/aidl_checkapi.cpp
@@ -62,7 +62,7 @@
   vector<string> annotations;
   for (const AidlAnnotation& annotation : node.GetAnnotations()) {
     if (kIgnoreAnnotations.find(annotation.GetType()) == kIgnoreAnnotations.end()) {
-      annotations.push_back(annotation.ToString(AidlConstantValueDecorator));
+      annotations.push_back(annotation.ToString());
     }
   }
   return annotations;
@@ -85,8 +85,9 @@
 
 static bool are_compatible_types(const AidlTypeSpecifier& older, const AidlTypeSpecifier& newer) {
   bool compatible = true;
-  if (older.ToString() != newer.ToString()) {
-    AIDL_ERROR(newer) << "Type changed: " << older.ToString() << " to " << newer.ToString() << ".";
+  if (older.Signature() != newer.Signature()) {
+    AIDL_ERROR(newer) << "Type changed: " << older.Signature() << " to " << newer.Signature()
+                      << ".";
     compatible = false;
   }
   compatible &= have_compatible_annotations(older, newer);