diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java
index a58270de..7077568d 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java
@@ -95,8 +95,8 @@ public abstract class AbstractPortTypesProvider implements PortTypesProvider {
 
 	private void createOperations(Definition definition, PortType portType) throws WSDLException {
 		MultiValueMap<String, Message> operations = new LinkedMultiValueMap<String, Message>();
-		for (Iterator<?> iterator = definition.getMessages().values().iterator(); iterator.hasNext();) {
-			Message message = (Message) iterator.next();
+		for (Object messageValue : definition.getMessages().values()) {
+			Message message = (Message) messageValue;
 			String operationName = getOperationName(message);
 			if (StringUtils.hasText(operationName)) {
 				operations.add(operationName, message);
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java
index f2aa1672..570919ed 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java
@@ -97,8 +97,8 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr
 	 */
 	@Override
 	public void addBindings(Definition definition) throws WSDLException {
-		for (Iterator<?> iterator = definition.getPortTypes().values().iterator(); iterator.hasNext();) {
-			PortType portType = (PortType) iterator.next();
+		for (Object portValue : definition.getPortTypes().values()) {
+			PortType portType = (PortType) portValue;
 			Binding binding = definition.createBinding();
 			binding.setPortType(portType);
 			populateBinding(definition, binding);
@@ -136,8 +136,8 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr
 
 	private void createBindingOperations(Definition definition, Binding binding) throws WSDLException {
 		PortType portType = binding.getPortType();
-		for (Iterator<?> operationIterator = portType.getOperations().iterator(); operationIterator.hasNext();) {
-			Operation operation = (Operation) operationIterator.next();
+		for (Object operationValue : portType.getOperations()) {
+			Operation operation = (Operation) operationValue;
 			BindingOperation bindingOperation = definition.createBindingOperation();
 			bindingOperation.setOperation(operation);
 			populateBindingOperation(definition, bindingOperation);
@@ -152,8 +152,8 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr
 				createBindingOutput(definition, operation, bindingOperation);
 				createBindingInput(definition, operation, bindingOperation);
 			}
-			for (Iterator<?> faultIterator = operation.getFaults().values().iterator(); faultIterator.hasNext();) {
-				Fault fault = (Fault) faultIterator.next();
+			for (Object faultValue : operation.getFaults().values()) {
+				Fault fault = (Fault) faultValue;
 				BindingFault bindingFault = definition.createBindingFault();
 				populateBindingFault(definition, bindingFault, fault);
 				if (StringUtils.hasText(bindingFault.getName())) {
@@ -281,11 +281,11 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr
 	}
 
 	private void createPorts(Definition definition, Service service) throws WSDLException {
-		for (Iterator<?> iterator = definition.getBindings().values().iterator(); iterator.hasNext();) {
-			Binding binding = (Binding) iterator.next();
+		for (Object bindingValue : definition.getBindings().values()) {
+			Binding binding = (Binding) bindingValue;
 			Port port = null;
-			for (Iterator<?> iterator1 = service.getPorts().values().iterator(); iterator1.hasNext();) {
-				Port existingPort = (Port) iterator1.next();
+			for (Object portValue : service.getPorts().values()) {
+				Port existingPort = (Port) portValue;
 				if (binding.equals(existingPort.getBinding())) {
 					port = existingPort;
 				}
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java
index 32c6685f..1b7aef1c 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java
@@ -50,8 +50,8 @@ public class DefaultMessagesProvider implements MessagesProvider {
 	public void addMessages(Definition definition) throws WSDLException {
 		Types types = definition.getTypes();
 		Assert.notNull(types, "No types element present in definition");
-		for (Iterator<?> iterator = types.getExtensibilityElements().iterator(); iterator.hasNext();) {
-			ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
+		for (Object element : types.getExtensibilityElements()) {
+			ExtensibilityElement extensibilityElement = (ExtensibilityElement) element;
 			if (extensibilityElement instanceof Schema) {
 				Schema schema = (Schema) extensibilityElement;
 				if (schema.getElement() != null) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java
index 1cba4345..783e9996 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java
@@ -311,8 +311,8 @@ public class Soap11Provider extends DefaultConcretePartProvider {
 	 */
 	@Override
 	protected void populatePort(Definition definition, Port port) throws WSDLException {
-		for (Iterator<?> iterator = port.getBinding().getExtensibilityElements().iterator(); iterator.hasNext();) {
-			if (iterator.next() instanceof SOAPBinding) {
+		for (Object extensibilityElement : port.getBinding().getExtensibilityElements()) {
+			if (extensibilityElement instanceof SOAPBinding) {
 				// this is a SOAP 1.1 binding, create a SOAP Address for it
 				super.populatePort(definition, port);
 				SOAPAddress soapAddress = (SOAPAddress) createSoapExtension(definition, Port.class, "address");
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java
index 07dda463..899f403b 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java
@@ -316,8 +316,8 @@ public class Soap12Provider extends DefaultConcretePartProvider {
 	 */
 	@Override
 	protected void populatePort(Definition definition, Port port) throws WSDLException {
-		for (Iterator<?> iterator = port.getBinding().getExtensibilityElements().iterator(); iterator.hasNext();) {
-			if (iterator.next() instanceof SOAP12Binding) {
+		for (Object extensibilityElement : port.getBinding().getExtensibilityElements()) {
+			if (extensibilityElement instanceof SOAP12Binding) {
 				// this is a SOAP 1.2 binding, create a SOAP Address for it
 				super.populatePort(definition, port);
 				SOAP12Address soapAddress = (SOAP12Address) createSoapExtension(definition, Port.class, "address");