diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
index a3e4c5f1..afbf9d64 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
@@ -338,8 +338,8 @@ public class FlowFacesContext extends FacesContextWrapper {
 			String detail = (String) ois.readObject();
 			int severityOrdinal = ois.readInt();
 			FacesMessage.Severity severity = FacesMessage.SEVERITY_INFO;
-			for (Iterator<?> iterator = FacesMessage.VALUES.iterator(); iterator.hasNext();) {
-				FacesMessage.Severity value = (FacesMessage.Severity) iterator.next();
+			for (Object o : FacesMessage.VALUES) {
+				FacesMessage.Severity value = (FacesMessage.Severity) o;
 				if (value.getOrdinal() == severityOrdinal) {
 					severity = value;
 				}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java b/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java
index 3ee2c779..488cedbe 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java
@@ -134,8 +134,7 @@ public class ConversationContainer implements Serializable {
 	 * Remove identified conversation from this container.
 	 */
 	public synchronized void removeConversation(ConversationId id) {
-		for (Iterator<ContainedConversation> it = conversations.iterator(); it.hasNext();) {
-			ContainedConversation conversation = it.next();
+		for (ContainedConversation conversation : conversations) {
 			if (conversation.getId().equals(id)) {
 				conversations.remove(conversation);
 				break;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
index bdeef514..854750e1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
@@ -547,8 +547,8 @@ public abstract class AbstractMvcView implements View {
 		if (!beanWrapper.isReadableProperty(propertyNames.get(0))) {
 			return false;
 		}
-		for (int i=0; i < propertyNames.size(); i++) {
-			if (!SourceVersion.isName(propertyNames.get(i))) {
+		for (String propertyName : propertyNames) {
+			if (!SourceVersion.isName(propertyName)) {
 				return false;
 			}
 		}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java
index a6ee624b..2fbc7a46 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java
@@ -261,9 +261,7 @@ public class ImplicitFlowVariableELResolverTests extends FlowDependentELResolver
 	@Test
 	public void testIsReadOnly_AllVars() {
 		RequestContextHolder.setRequestContext(new MockRequestContext());
-		Iterator<String> i = vars.iterator();
-		while (i.hasNext()) {
-			String var = i.next();
+		for (String var : vars) {
 			assertTrue(context.getELResolver().isReadOnly(context, null, var));
 		}
 	}
@@ -271,9 +269,7 @@ public class ImplicitFlowVariableELResolverTests extends FlowDependentELResolver
 	@Test
 	public void testSetValue_AllVars() {
 		RequestContextHolder.setRequestContext(new MockRequestContext());
-		Iterator<String> i = vars.iterator();
-		while (i.hasNext()) {
-			String var = i.next();
+		for (String var : vars) {
 			try {
 				context.getELResolver().setValue(context, null, var, new Object());
 				fail("setValue should not be allowed");