diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
index 108a3267..01500a0f 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
@@ -8,7 +8,6 @@ import javax.el.VariableMapper;
 import javax.faces.context.FacesContext;
 
 import org.springframework.binding.expression.el.DefaultELContextFactory;
-import org.springframework.binding.expression.el.ELContextFactory;
 import org.springframework.binding.expression.el.ELExpressionParser;
 
 /**
@@ -22,16 +21,10 @@ public class Jsf11ELExpressionParser extends ELExpressionParser {
 	super(expressionFactory, new Jsf11ELContextFactory());
     }
 
-    public Jsf11ELExpressionParser(ExpressionFactory expressionFactory, ELContextFactory contextFactory) {
-	super(expressionFactory, contextFactory);
-    }
-
     private static class Jsf11ELContextFactory extends DefaultELContextFactory {
 
 	public ELContext getEvaluationContext(Object target) {
-
-	    FacesContext context = FacesContext.getCurrentInstance();
-	    return new Jsf11ELContext(context);
+	    return new Jsf11ELContext(FacesContext.getCurrentInstance());
 	}
 
 	private static class Jsf11ELContext extends ELContext {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
index c8cc280e..f848976f 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
@@ -5,7 +5,6 @@ import javax.el.ExpressionFactory;
 import javax.faces.context.FacesContext;
 
 import org.springframework.binding.expression.el.DefaultELContextFactory;
-import org.springframework.binding.expression.el.ELContextFactory;
 import org.springframework.binding.expression.el.ELExpressionParser;
 
 /**
@@ -19,15 +18,9 @@ public class Jsf12ELExpressionParser extends ELExpressionParser {
 	super(expressionFactory, new Jsf12ELContextFactory());
     }
 
-    public Jsf12ELExpressionParser(ExpressionFactory expressionFactory, ELContextFactory contextFactory) {
-	super(expressionFactory, contextFactory);
-    }
-
     private static class Jsf12ELContextFactory extends DefaultELContextFactory {
-
 	public ELContext getEvaluationContext(Object target) {
-	    FacesContext context = FacesContext.getCurrentInstance();
-	    return context.getELContext();
+	    return FacesContext.getCurrentInstance().getELContext();
 	}
     }
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.hbm.xml b/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.hbm.xml
index 6fe806b7..77ccca4f 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.hbm.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.hbm.xml
@@ -3,12 +3,10 @@
     "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping
-	package="org.springframework.webflow.support.persistence"
-	default-access="field" default-lazy="false">
+<hibernate-mapping package="org.springframework.webflow.support.persistence" default-access="field" default-lazy="false">
 	<class name="TestBean" table="T_BEAN">
 		<id name="entityId" column="ID">
-			<generator class="increment"/>
+			<generator class="increment" />
 		</id>
 		<property name="name" column="NAME" />
 	</class>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.java b/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.java
index 5b7526e6..9db4b94b 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/TestBean.java
@@ -17,15 +17,15 @@ package org.springframework.webflow.support.persistence;
 
 public class TestBean {
 
-	private long entityId;
+    private long entityId;
 
-	private String name;
+    private String name;
 
-	public TestBean(String name) {
-		this.name = name;
-	}
+    public TestBean(String name) {
+	this.name = name;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+	return name;
+    }
 }