Source code switching using //## has been simplified.

h2/src/main/org/h2/Driver.java

@@ -17,9 +17,9 @@ import org.h2.message.DbException;
 import org.h2.message.TraceSystem;
 import org.h2.upgrade.DbUpgrade;
 
-/*## Java 1.7 begin ##
+/*## Java 1.7 ##
 import java.util.logging.Logger;
-## Java 1.7 end ##*/
+//*/
 
 /**
  * The database driver. An application should not use this class directly. The
@@ -138,11 +138,11 @@ public class Driver implements java.sql.Driver {
     /**
      * [Not supported]
      */
-/*## Java 1.7 begin ##
+/*## Java 1.7 ##
     public Logger getParentLogger() {
         return null;
     }
-## Java 1.7 end ##*/
+//*/
 
     /**
      * INTERNAL

h2/src/main/org/h2/constant/SysProperties.java

@@ -116,25 +116,21 @@ public class SysProperties {
      * System property <code>h2.check</code> (default: true).<br />
      * Assertions in the database engine.
      */
-    //## CHECK begin ##
+    //## CHECK ##
     public static final boolean CHECK = Utils.getProperty("h2.check", true);
-    //## CHECK end ##
-
-    /*## NO_CHECK begin ##
+    /*/
     public static final boolean CHECK = false;
-    ## NO_CHECK end ##*/
+    //*/
 
     /**
      * System property <code>h2.check2</code> (default: true).<br />
      * Additional assertions in the database engine.
      */
-    //## CHECK begin ##
+    //## CHECK ##
     public static final boolean CHECK2 = Utils.getProperty("h2.check2", false);
-    //## CHECK end ##
-
-    /*## NO_CHECK begin ##
+    /*/
     public static final boolean CHECK2 = false;
-    ## NO_CHECK end ##*/
+    //*/
 
     /**
      * System property <code>h2.clientTraceDirectory</code> (default: