Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 3ad40e2a587e38b92efe0377110113421e0e0d01)
+++ Jenkinsfile	(revision 94c9b8107738984305148be655649dbd86e31049)
@@ -83,4 +83,28 @@
 // Helper classes/variables/routines
 //===========================================================================================================
+//Description of a compiler (Must be serializable since pipelines are persistent)
+class CC_Desc implements Serializable {
+	public String cc_name
+	public String cpp_cc
+	public String cfa_cc
+
+	CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
+		this.cc_name = cc_name
+		this.cpp_cc = cpp_cc
+		this.cfa_cc = cfa_cc
+	}
+}
+
+//Description of an architecture (Must be serializable since pipelines are persistent)
+class Arch_Desc implements Serializable {
+	public String name
+	public String flags
+
+	Arch_Desc(String name, String flags) {
+		this.name  = name
+		this.flags = flags
+	}
+}
+
 class BuildSettings implements Serializable {
 	public final CC_Desc Compiler
@@ -99,19 +123,5 @@
 	public final String DescShort
 
-
-	//Description of a compiler (Must be serializable since pipelines are persistent)
-	private class CC_Desc implements Serializable {
-		public String cc_name
-		public String cpp_cc
-		public String cfa_cc
-
-		CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-			this.cc_name = cc_name
-			this.cpp_cc = cpp_cc
-			this.cfa_cc = cfa_cc
-		}
-	}
-
-	private static CC_Desc compiler_from_params(String cc) {
+	def compiler_from_params(cc) {
 		switch( cc ) {
 			case 'gcc-6':
@@ -132,16 +142,5 @@
 	}
 
-	//Description of an architecture (Must be serializable since pipelines are persistent)
-	private class Arch_Desc implements Serializable {
-		public String name
-		public String flags
-
-		Arch_Desc(String name, String flags) {
-			this.name  = name
-			this.flags = flags
-		}
-	}
-
-	private static Arch_Desc architecture_from_params( String arch ) {
+	def architecture_from_params( arch ) {
 		switch( arch ) {
 			case 'x64':
@@ -157,6 +156,6 @@
 
 	BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
-		this.Compiler	      = BuildSettings.compiler_from_params( param.Compiler )
-		this.Architecture       = BuildSettings.architecture_from_params( param.Architecture )
+		this.Compiler	      = compiler_from_params( param.Compiler )
+		this.Architecture       = architecture_from_params( param.Architecture )
 		this.RunAllTests        = param.RunAllTests
 		this.RunBenchmark       = param.RunBenchmark