diff --git a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
index f53de42889e..38950e59785 100644
--- a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
+++ b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
@@ -467,7 +467,7 @@ class JmxMetaMapBuilder {
                     if (descriptor && descriptor instanceof Map) {
                         // foo:[params:["paramTypeName0":[name:"",desc:""], paramTypeNameN[:]]]
                         if (descriptor.params && descriptor.params instanceof Map) {
-                            params = descriptor?.params?.keySet()?.toList()
+                            params = descriptor?.params.keySet().toList()
                         }
                         // foo:[params:["paramTypeName0",...,"paramTypeNameN"]]
                         if (descriptor.params && descriptor.params instanceof List) {
diff --git a/subprojects/groovy-typecheckers/src/main/groovy/groovy/typecheckers/FormatStringChecker.groovy b/subprojects/groovy-typecheckers/src/main/groovy/groovy/typecheckers/FormatStringChecker.groovy
index 893cab1ae00..0e086312805 100644
--- a/subprojects/groovy-typecheckers/src/main/groovy/groovy/typecheckers/FormatStringChecker.groovy
+++ b/subprojects/groovy-typecheckers/src/main/groovy/groovy/typecheckers/FormatStringChecker.groovy
@@ -255,7 +255,7 @@ class FormatStringChecker extends GroovyTypeCheckingExtensionSupport.TypeCheckin
             }
 
             void checkBadFlags(flagList, conversion, Expression target, String badFlags) {
-                def mismatched = flagList?.findAll { badFlags.contains(it) }?.join()
+                def mismatched = flagList?.findAll { badFlags.contains(it) }.join()
                 if (mismatched) {
                     addStaticTypeError("FormatFlagsConversionMismatch: Conversion = $conversion, Flags = '$mismatched'", target)
                 }