Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 94c9b8107738984305148be655649dbd86e31049)
+++ Jenkinsfile	(revision 97144e2e6f152574c7e7b5e4555051bdc8e7fa76)
@@ -123,39 +123,33 @@
 	public final String DescShort
 
-	def compiler_from_params(cc) {
-		switch( cc ) {
+	BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
+		switch( param.Compiler ) {
 			case 'gcc-6':
-				return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+				this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
 			break
 			case 'gcc-5':
-				return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+				this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
 			break
 			case 'gcc-4.9':
-				return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+				this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
 			break
 			case 'clang':
-				return new CC_Desc('clang', 'clang++', 'gcc-6')
+				this.Compiler = new CC_Desc('clang', 'clang++', 'gcc-6')
 			break
 			default :
 				error "Unhandled compiler : ${cc}"
 		}
-	}
-
-	def architecture_from_params( arch ) {
-		switch( arch ) {
+
+		switch( param.Architecture ) {
 			case 'x64':
-				return new Arch_Desc('x64', '--host=x86_64')
+				this.Architecture = new Arch_Desc('x64', '--host=x86_64')
 			break
 			case 'x86':
-				return new Arch_Desc('x86', '--host=i386')
+				this.Architecture = new Arch_Desc('x86', '--host=i386')
 			break
 			default :
 				error "Unhandled architecture : ${arch}"
 		}
-	}
-
-	BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
-		this.Compiler	      = compiler_from_params( param.Compiler )
-		this.Architecture       = architecture_from_params( param.Architecture )
+
 		this.RunAllTests        = param.RunAllTests
 		this.RunBenchmark       = param.RunBenchmark