diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
index 49eecd68e96..8dae419eff3 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
@@ -303,8 +303,7 @@ abstract class NamedParameterUtils {
 						}
 						k++;
 						Object entryItem = entryIter.next();
-						if (entryItem instanceof Object[]) {
-							Object[] expressionList = (Object[]) entryItem;
+						if (entryItem instanceof Object[] expressionList) {
 							actualSql.append('(');
 							for (int m = 0; m < expressionList.length; m++) {
 								if (m > 0) {
@@ -397,10 +396,9 @@ abstract class NamedParameterUtils {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof ParameterHolder)) {
+			if (!(o instanceof ParameterHolder that)) {
 				return false;
 			}
-			ParameterHolder that = (ParameterHolder) o;
 			return this.startIndex == that.startIndex && this.endIndex == that.endIndex
 					&& Objects.equals(this.parameterName, that.parameterName);
 		}
@@ -522,8 +520,7 @@ abstract class NamedParameterUtils {
 				Iterator<BindMarker> markers = bindMarkers.iterator();
 				while (iterator.hasNext()) {
 					Object valueToBind = iterator.next();
-					if (valueToBind instanceof Object[]) {
-						Object[] objects = (Object[]) valueToBind;
+					if (valueToBind instanceof Object[] objects) {
 						for (Object object : objects) {
 							bind(target, markers, object);
 						}
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java
index 69f9ed92bd7..374ebec61be 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java
@@ -113,10 +113,9 @@ public final class Parameter {
 		if (this == obj) {
 			return true;
 		}
-		if (!(obj instanceof Parameter)) {
+		if (!(obj instanceof Parameter other)) {
 			return false;
 		}
-		Parameter other = (Parameter) obj;
 		return (ObjectUtils.nullSafeEquals(this.value, other.value) &&
 				ObjectUtils.nullSafeEquals(this.type, other.type));
 	}