diff --git a/src/com/google/javascript/jscomp/NodeUtil.java b/src/com/google/javascript/jscomp/NodeUtil.java
index 740e5ad7a3d..5d3d092ad4f 100644
--- a/src/com/google/javascript/jscomp/NodeUtil.java
+++ b/src/com/google/javascript/jscomp/NodeUtil.java
@@ -4473,7 +4473,7 @@ public static interface Visitor {
 
   /** A pre-order traversal, calling Visitor.visit for each decendent. */
   public static void visitPreOrder(Node node, Visitor visitor) {
-    visitPreOrder(node, visitor, Predicates.<Node>alwaysTrue());
+    visitPreOrder(node, visitor, Predicates.alwaysTrue());
   }
 
   /** A pre-order traversal, calling Visitor.visit for each child matching the predicate. */
@@ -4488,6 +4488,11 @@ public static void visitPreOrder(
     }
   }
 
+  /** A post-order traversal, calling Visitor.visit for each decendent. */
+  public static void visitPostOrder(Node node, Visitor visitor) {
+    visitPostOrder(node, visitor, Predicates.alwaysTrue());
+  }
+
   /** A post-order traversal, calling Visitor.visit for each descendant matching the predicate. */
   public static void visitPostOrder(
       Node node, Visitor visitor, Predicate<Node> traverseChildrenPred) {
diff --git a/src/com/google/javascript/jscomp/PolymerPassStaticUtils.java b/src/com/google/javascript/jscomp/PolymerPassStaticUtils.java
index ade9cda9f2c..64c74c3fe60 100644
--- a/src/com/google/javascript/jscomp/PolymerPassStaticUtils.java
+++ b/src/com/google/javascript/jscomp/PolymerPassStaticUtils.java
@@ -19,7 +19,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.CaseFormat;
-import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.javascript.jscomp.PolymerPass.MemberDefinition;
 import com.google.javascript.jscomp.parsing.parser.util.format.SimpleFormat;
@@ -71,8 +70,7 @@ public void visit(Node n) {
                   compiler.reportChangeToEnclosingScope(dollarChildProp);
                 }
               }
-            },
-            Predicates.<Node>alwaysTrue());
+            });
       }
     }
   }
diff --git a/test/com/google/javascript/jscomp/CompilerTestCase.java b/test/com/google/javascript/jscomp/CompilerTestCase.java
index 652dc6961d4..d1648b23376 100644
--- a/test/com/google/javascript/jscomp/CompilerTestCase.java
+++ b/test/com/google/javascript/jscomp/CompilerTestCase.java
@@ -23,7 +23,6 @@
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Joiner;
-import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -1990,8 +1989,7 @@ public void visit(Node n) {
               matches.add(n);
             }
           }
-        },
-        Predicates.alwaysTrue());
+        });
     return matches;
   }
 
diff --git a/test/com/google/javascript/jscomp/PolymerBehaviorExtractorTest.java b/test/com/google/javascript/jscomp/PolymerBehaviorExtractorTest.java
index 18c44b4911a..b75e8a7167c 100644
--- a/test/com/google/javascript/jscomp/PolymerBehaviorExtractorTest.java
+++ b/test/com/google/javascript/jscomp/PolymerBehaviorExtractorTest.java
@@ -19,7 +19,6 @@
 import static com.google.javascript.jscomp.PolymerPassErrors.POLYMER_INVALID_BEHAVIOR;
 import static com.google.javascript.jscomp.testing.JSErrorSubject.assertError;
 
-import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.javascript.jscomp.PolymerBehaviorExtractor.BehaviorDefinition;
 import com.google.javascript.rhino.Node;
@@ -145,11 +144,13 @@ private void parseAndInitializeExtractor(String code) {
     GlobalNamespace globalNamespace = new GlobalNamespace(compiler, root);
     extractor = new PolymerBehaviorExtractor(compiler, globalNamespace);
 
-    NodeUtil.visitPostOrder(root, (Node node) -> {
-      if (isBehaviorArrayDeclaration(node)) {
-        behaviorArray = node;
-      }
-    }, Predicates.<Node>alwaysTrue());
+    NodeUtil.visitPostOrder(
+        root,
+        node -> {
+          if (isBehaviorArrayDeclaration(node)) {
+            behaviorArray = node;
+          }
+        });
 
     assertNotNull(behaviorArray);
   }
diff --git a/test/com/google/javascript/jscomp/PolymerClassDefinitionTest.java b/test/com/google/javascript/jscomp/PolymerClassDefinitionTest.java
index 8670506329b..ce65e6fa33e 100644
--- a/test/com/google/javascript/jscomp/PolymerClassDefinitionTest.java
+++ b/test/com/google/javascript/jscomp/PolymerClassDefinitionTest.java
@@ -18,7 +18,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.javascript.jscomp.testing.NodeSubject.assertNode;
 
-import com.google.common.base.Predicates;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;
 
@@ -164,8 +163,7 @@ public void visit(Node node) {
               polymerCall = node;
             }
           }
-        },
-        Predicates.<Node>alwaysTrue());
+        });
 
     assertNotNull(polymerCall);
     return PolymerClassDefinition.extractFromCallNode(polymerCall, compiler, globalNamespace);
@@ -184,8 +182,7 @@ public void visit(Node node) {
               polymerCall = node;
             }
           }
-        },
-        Predicates.<Node>alwaysTrue());
+        });
 
     assertNotNull(polymerCall);
     return PolymerClassDefinition.extractFromClassNode(polymerCall, compiler, globalNamespace);
diff --git a/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java b/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java
index bb260ab88c6..5f1f890bf2a 100644
--- a/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java
+++ b/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java
@@ -17,7 +17,6 @@
 
 import static com.google.javascript.jscomp.testing.NodeSubject.assertNode;
 
-import com.google.common.base.Predicates;
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.rhino.Node;
 
@@ -181,8 +180,7 @@ public void visit(Node node) {
               polymerCall = node;
             }
           }
-        },
-        Predicates.<Node>alwaysTrue());
+        });
 
     assertNotNull(polymerCall);
     PolymerClassDefinition classDef =