2 files changed, 10 insertions, 22 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/RankProfile.java b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
index 502b054f84e..9b3e236612a 100644
--- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
@@ -615,18 +615,6 @@ public class RankProfile implements Cloneable {
                 .orElse(Set.of());
     }
 
-    private void addSummaryFeature(ReferenceNode feature) {
-        if (summaryFeatures == null)
-            summaryFeatures = new LinkedHashSet<>();
-        summaryFeatures.add(feature);
-    }
-
-    private void addMatchFeature(ReferenceNode feature) {
-        if (matchFeatures == null)
-            matchFeatures = new LinkedHashSet<>();
-        matchFeatures.add(feature);
-    }
-
     private void addImplicitMatchFeatures(List<FeatureList> list) {
         if (hiddenMatchFeatures == null)
             hiddenMatchFeatures = new LinkedHashSet<>();
@@ -642,15 +630,19 @@ public class RankProfile implements Cloneable {
 
     /** Adds the content of the given feature list to the internal list of summary features. */
     public void addSummaryFeatures(FeatureList features) {
+        if (summaryFeatures == null)
+            summaryFeatures = new LinkedHashSet<>();
         for (ReferenceNode feature : features) {
-            addSummaryFeature(feature);
+            summaryFeatures.add(feature);
         }
     }
 
     /** Adds the content of the given feature list to the internal list of match features. */
     public void addMatchFeatures(FeatureList features) {
+        if (matchFeatures == null)
+            matchFeatures = new LinkedHashSet<>();
         for (ReferenceNode feature : features) {
-            addMatchFeature(feature);
+            matchFeatures.add(feature);
         }
     }
 
@@ -661,20 +653,16 @@ public class RankProfile implements Cloneable {
                 .orElse(Set.of());
     }
 
-    private void addRankFeature(ReferenceNode feature) {
-        if (rankFeatures == null)
-            rankFeatures = new LinkedHashSet<>();
-        rankFeatures.add(feature);
-    }
-
     /**
      * Adds the content of the given feature list to the internal list of rank features.
      *
      * @param features The features to add.
      */
     public void addRankFeatures(FeatureList features) {
+        if (rankFeatures == null)
+            rankFeatures = new LinkedHashSet<>();
         for (ReferenceNode feature : features) {
-            addRankFeature(feature);
+            rankFeatures.add(feature);
         }
     }
 
diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj
index 591f0eb8b37..97aa42f79c9 100755
--- a/searchlib/src/main/javacc/RankingExpressionParser.jj
+++ b/searchlib/src/main/javacc/RankingExpressionParser.jj
@@ -177,7 +177,7 @@ List<ReferenceNode> featureList() :
     ReferenceNode exp;
 }
 {
-    ( ( exp = feature() { ret.add(exp); } )+ <EOF> )
+    ( ( exp = feature() { ret.add(exp); } )* <EOF> )
     { return ret; }
 }