these two object fields can be local variables

h2/src/main/org/h2/expression/JavaAggregate.java

@@ -30,7 +30,6 @@ public class JavaAggregate extends Expression {
 
     private final UserAggregate userAggregate;
     private final Select select;
-    private AggregateFunction aggregate;
     private Expression[] args;
     private int[] argTypes;
     private int dataType;
@@ -117,7 +116,7 @@ public class JavaAggregate extends Expression {
             argSqlTypes[i] = DataType.convertTypeToSQLType(type);
         }
         try {
-            aggregate = getInstance();
+            AggregateFunction aggregate = getInstance();
             dataType = DataType.convertSQLTypeToValueType(aggregate.getType(argSqlTypes));
         } catch (SQLException e) {
             throw DbException.convert(e);

h2/src/test/org/h2/test/synth/TestRandomSQL.java

@@ -23,7 +23,6 @@ public class TestRandomSQL extends TestBase {
 
     private int seed;
     private boolean exitOnError = true;
-    private BnfRandom bnfRandom;
     private int success, total;
 
     /**
@@ -78,7 +77,7 @@ public class TestRandomSQL extends TestBase {
         }
         Statement stat = conn.createStatement();
 
-        bnfRandom = new BnfRandom();
+        BnfRandom bnfRandom = new BnfRandom();
         bnfRandom.setSeed(seed);
         for (int i = 0; i < bnfRandom.getStatementCount(); i++) {
             String sql = bnfRandom.getRandomSQL();