diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/AbstractConditionalEnumConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/AbstractConditionalEnumConverter.java
index e6c94f65f3..e091b27038 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/AbstractConditionalEnumConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/AbstractConditionalEnumConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ abstract class AbstractConditionalEnumConverter implements ConditionalConverter
 
 	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-		for (Class<?> interfaceType : ClassUtils.getAllInterfacesForClass(sourceType.getType())) {
+		for (Class<?> interfaceType : ClassUtils.getAllInterfacesForClassAsSet(sourceType.getType())) {
 			if (this.conversionService.canConvert(TypeDescriptor.valueOf(interfaceType), targetType)) {
 				return false;
 			}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
index 1473f52e0e..13da3e868b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -152,8 +152,7 @@ public class Projection extends SpelNodeImpl {
 			}
 			nextType = nextType.getSuperclass();
 		}
-		Class<?>[] interfaces = ClassUtils.getAllInterfacesForClass(newType);
-		for (Class<?> nextInterface : interfaces) {
+		for (Class<?> nextInterface : ClassUtils.getAllInterfacesForClassAsSet(newType)) {
 			if (nextInterface.isAssignableFrom(oldType)) {
 				return nextInterface;
 			}
diff --git a/src/asciidoc/integration.adoc b/src/asciidoc/integration.adoc
index 78a3830291..26dc0772bc 100644
--- a/src/asciidoc/integration.adoc
+++ b/src/asciidoc/integration.adoc
@@ -3656,12 +3656,12 @@ metadata-driven management interfaces for your Spring-exposed MBeans.
 
 
 [[jmx-interface-metadata-types]]
-==== Source-Level metadata types
+==== Source-level metadata types
 
 The following source level metadata types are available for use in Spring JMX:
 
 [[jmx-metadata-types]]
-.Source-Level Metadata Types
+.Source-level metadata types
 |===
 | Purpose| Annotation| Annotation Type
 
@@ -3686,7 +3686,7 @@ The following configuration parameters are available for use on these source-lev
 metadata types:
 
 [[jmx-metadata-parameters]]
-.Source-Level metadata parameters
+.Source-level metadata parameters
 [cols="1,3,1"]
 |===
 | Parameter| Description| Applies to