--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java	Fri Dec 16 12:08:46 2016 +0100
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Unit.java	Fri Dec 16 15:27:34 2016 +0000
@@ -168,11 +168,11 @@
             // Snippets to add to imports
             Collection<Snippet> plus = plusUnfiltered.stream()
                     .filter(u -> !units.contains(u))
-                    .map(u -> u.snippet())
+                    .map(Unit::snippet)
                     .collect(toList());
             // Snippets to wrap in an outer
             List<Snippet> snippets = units.stream()
-                    .map(u -> u.snippet())
+                    .map(Unit::snippet)
                     .collect(toList());
             // Snippet wraps to wrap in an outer
             List<Wrap> wraps = units.stream()
@@ -305,8 +305,8 @@
             return true;
         }
         ClassBytecodes[] cbcs = toRedefine.stream()
-                .map(ci -> ci.toClassBytecodes())
-                .toArray(size -> new ClassBytecodes[size]);
+                .map(ClassInfo::toClassBytecodes)
+                .toArray(ClassBytecodes[]::new);
         try {
             state.executionControl().redefine(cbcs);
             state.classTracker.markLoaded(cbcs);