--- old/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java	2018-02-20 21:46:38.272983910 -0800
+++ new/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java	2018-02-20 21:46:38.032981787 -0800
@@ -56,10 +56,11 @@
     // Creates the built-in class loaders.
     static {
         // -Xbootclasspath/a or -javaagent with Boot-Class-Path attribute
-        String s = VM.getSavedProperty("jdk.boot.class.path.append");
-        BOOT_LOADER = new BootClassLoader((s != null && s.length() > 0)
-                                          ? new URLClassPath(s, true)
-                                          : null);
+        String append = VM.getSavedProperty("jdk.boot.class.path.append");
+        BOOT_LOADER = new BootClassLoader(
+                (append != null && append.length() > 0)
+                ? new URLClassPath(append, true)
+                : null);
         PLATFORM_LOADER = new PlatformClassLoader(BOOT_LOADER);
 
         // A class path is required when no main module is specified.
@@ -69,8 +70,8 @@
         // the empty string and instead treat it as unspecified.
         String cp = System.getProperty("java.class.path");
         if (cp == null || cp.length() == 0) {
-            String mainMid = System.getProperty("jdk.module.main");
-            cp = (mainMid == null) ? "" : null;
+            String mainModuleName = System.getProperty("jdk.module.main");
+            cp = (mainModuleName == null) ? "" : null;
         }
         URLClassPath ucp = new URLClassPath(cp, false);
         APP_LOADER = new AppClassLoader(PLATFORM_LOADER, ucp);