--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java	Fri Dec 16 12:08:46 2016 +0100
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ArgTokenizer.java	Fri Dec 16 15:27:34 2016 +0000
@@ -30,6 +30,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -139,7 +141,7 @@
      */
     int optionCount() {
         return (int) options.entrySet().stream()
-                .filter(e -> e.getValue())
+                .filter(Entry::getValue)
                 .count();
     }