1 files changed, 25 insertions, 7 deletions
diff --git a/src/main/java/com/google/escapevelocity/Macro.java b/src/main/java/com/google/escapevelocity/Macro.java
index 151ded2..fbb1764 100644
--- a/src/main/java/com/google/escapevelocity/Macro.java
+++ b/src/main/java/com/google/escapevelocity/Macro.java
@@ -11,8 +11,29 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package com.google.escapevelocity;
 
+import com.google.common.base.Verify;
+import com.google.common.collect.ImmutableList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,7 +71,7 @@ class Macro {
 
   Object evaluate(EvaluationContext context, List<Node> thunks) {
     try {
-      assert thunks.size() == parameterNames.size() : "Argument mistmatch for " + name;
+      Verify.verify(thunks.size() == parameterNames.size(), "Argument mistmatch for %s", name);
       Map<String, Node> parameterThunks = new LinkedHashMap<>();
       for (int i = 0; i < parameterNames.size(); i++) {
         parameterThunks.put(parameterNames.get(i), thunks.get(i));
@@ -121,12 +142,9 @@ class Macro {
       } else {
         parameterThunks.remove(var);
         final Runnable originalUndo = originalEvaluationContext.setVar(var, value);
-        return new Runnable() {
-          @Override
-          public void run() {
-            originalUndo.run();
-            parameterThunks.put(var, thunk);
-          }
+        return () -> {
+          originalUndo.run();
+          parameterThunks.put(var, thunk);
         };
       }
     }