diff -u results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.BatchEECLI.jimple results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.BatchEECLI.jimple
--- results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.BatchEECLI.jimple	2025-03-13 07:42:30.812456493 +0000
+++ results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.BatchEECLI.jimple	2025-03-13 07:43:16.239743514 +0000
@@ -316,7 +316,7 @@
 org.apache.commons.cli.Options v;
 java.util.Map v;
 int v, v;
-java.lang.String v, v, v, v;
+java.lang.String v, v, v;
 org.apache.commons.cli.Option v;
 boolean v;
 org.apache.commons.cli.Option$Builder v, v, v;
@@ -344,8 +344,7 @@
 if v == null goto label;
 if v == null goto label;
 v = new java.lang.IllegalArgumentException;
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("An @Option can\'t get @Arguments: \u0001");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.reflect.Field)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("An @Option can\'t get @Arguments: \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 label:
@@ -385,7 +384,7 @@
 private static java.lang.String help(java.util.Map)
 {
 java.util.Map v;
-java.lang.String v, v, v, v, v, v, v;
+java.lang.String v, v, v, v, v, v;
 boolean v, v;
 java.util.Iterator v;
 java.util.Set v;
@@ -407,8 +406,7 @@
 if v != null goto label;
 v = new java.lang.IllegalArgumentException;
 v = interfaceinvoke v.<java.util.Map$Entry: java.lang.Object getValue()>();
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Missing @Command on \u0001");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.Object)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Missing @Command on \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 label:
@@ -431,15 +429,14 @@
 java.util.Map v;
 java.lang.'annotation'.Annotation v;
 java.lang.Class v;
-java.lang.String v, v, v;
+java.lang.String v, v;
 java.lang.IllegalArgumentException v;
 v := @parameter: java.util.Map;
 v := @parameter: java.lang.Class;
 v = virtualinvoke v.<java.lang.Class: java.lang.'annotation'.Annotation getAnnotation(java.lang.Class)>(class "Lorg/apache/batchee/cli/command/api/Command;");
 if v != null goto label;
 v = new java.lang.IllegalArgumentException;
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("\u is not a command, missing @Command");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.Class)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("\u is not a command, missing @Command");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 label:
diff -u results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.SocketCommand.jimple results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.SocketCommand.jimple
--- results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.SocketCommand.jimple	2025-03-13 07:42:30.856455803 +0000
+++ results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.SocketCommand.jimple	2025-03-13 07:43:16.307742447 +0000
@@ -35,7 +35,7 @@
 java.net.Socket v, v;
 java.util.concurrent.atomic.AtomicReference v;
 int v, v, v, v, v, v;
-java.lang.String v, v, v, v;
+java.lang.String v, v, v;
 org.apache.batchee.container.exception.BatchContainerRuntimeException v, v;
 java.io.OutputStream v;
 java.io.IOException v;
@@ -92,8 +92,7 @@
 v = virtualinvoke v.<java.lang.Integer: int intValue()>();
 if v == 0 goto label;
 v = virtualinvoke v.<java.util.concurrent.atomic.AtomicReference: java.lang.Object get()>();
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("unexpected answer: \u0001");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.Object)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("unexpected answer: \u0001");
 virtualinvoke v.<org.apache.batchee.cli.command.SocketCommand: void info(java.lang.String)>(v);
 label:
 staticinvoke <org.apache.commons.io.IOUtils: void closeQuietly(java.net.Socket)>(v);
diff -u results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.internal.DefaultCliConfiguration.jimple results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.internal.DefaultCliConfiguration.jimple
--- results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.internal.DefaultCliConfiguration.jimple	2025-03-13 07:42:30.832456179 +0000
+++ results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.cli.command.internal.DefaultCliConfiguration.jimple	2025-03-13 07:43:16.271743012 +0000
@@ -143,7 +143,7 @@
 short v;
 int v;
 java.lang.Boolean v;
-java.lang.String v, v, v;
+java.lang.String v, v;
 java.lang.Class[] v;
 char v;
 java.lang.IllegalArgumentException v;
@@ -209,8 +209,7 @@
 v := @caughtexception;
 label:
 v = new java.lang.IllegalArgumentException;
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String,java.lang.String)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("\u not supported as option with value \'\u0001\'");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.reflect.Type,java.lang.String)>(v, v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("\u not supported as option with value \'\u0001\'");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 catch java.lang.Exception from label to label with label;
diff -u results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.jaxrs.client.BatchEEJAXRSClientBase.jimple results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.jaxrs.client.BatchEEJAXRSClientBase.jimple
--- results/org.apache.batchee/batchee/2.0.0/jnorm/reference/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.jaxrs.client.BatchEEJAXRSClientBase.jimple	2025-03-13 07:42:32.208434586 +0000
+++ results/org.apache.batchee/batchee/2.0.0/jnorm/rebuild/batchee-cli-2.0.0-bundle.jar:batchee-cli-2.0.0-bundle.jar/org.apache.batchee.jaxrs.client.BatchEEJAXRSClientBase.jimple	2025-03-13 07:43:17.691720724 +0000
@@ -15,7 +15,7 @@
 {
 java.lang.Object[] v;
 java.util.Map v;
-java.lang.String v, v, v;
+java.lang.String v, v;
 java.lang.reflect.Method v;
 boolean v;
 org.apache.batchee.jaxrs.client.BatchEEJAXRSClientBase v;
@@ -38,8 +38,7 @@
 v = interfaceinvoke v.<java.util.Map: java.lang.Object get(java.lang.Object)>(v);
 if v != null goto label;
 v = new java.lang.IllegalArgumentException;
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Can\'t find mapping for \u0001");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.reflect.Method)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Can\'t find mapping for \u0001");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 label:
@@ -54,7 +53,7 @@
 {
 org.apache.batchee.jaxrs.common.RestJobInstance v;
 long v;
-java.lang.String v, v, v;
+java.lang.String v, v;
 boolean v, v, v, v, v;
 java.lang.IllegalArgumentException v;
 org.apache.batchee.jaxrs.common.RestProperties v;
@@ -98,8 +97,7 @@
 return v;
 label:
 v = new java.lang.IllegalArgumentException;
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unexpected type \u for a parameter");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.reflect.Type)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unexpected type \u for a parameter");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 }
@@ -112,7 +110,7 @@
 java.util.ArrayList v, v, v, v;
 org.apache.batchee.jaxrs.common.RestStepExecution v;
 org.apache.batchee.jaxrs.common.RestJobExecution v;
-java.lang.String v, v, v, v, v, v, v, v, v, v;
+java.lang.String v, v, v, v, v, v, v, v, v;
 java.util.Properties v, v, v;
 java.util.Date v, v, v, v, v, v, v, v, v, v;
 org.apache.batchee.jaxrs.common.RestJobInstance v;
@@ -316,8 +314,7 @@
 return v;
 label:
 v = new java.lang.IllegalArgumentException;
-v = staticinvoke <java.lang.String: java.lang.String valueOf(java.lang.Object)>(v);
-v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.String)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unexpected type \u for a returned type");
+v = dynamicinvoke "makeConcatWithConstants" <java.lang.String (java.lang.reflect.Type)>(v) <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>("Unexpected type \u for a returned type");
 specialinvoke v.<java.lang.IllegalArgumentException: void <init>(java.lang.String)>(v);
 throw v;
 }
