diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala
index 6d46c07b3..87e66b533 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala
+++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala
@@ -73,31 +73,14 @@ object Conversions {
     
     implicit def javaMapPath[K,V](l: java.util.Map[K,V]): MapPath[K,V] = aliasFactory.getCurrentAndReset();
     
-//    implicit def expression[T](arg: T): Expression[T] = {
-//        var rv : Expression[T] = aliasFactory.getCurrentAndReset();
-//        if (rv != null){
-//            rv;
-//        }else{
-//            arg match {
-//                case x:Expression[T] => x;
-//                case x:ManagedObject => x.__mappedPath.asInstanceOf[Expression[T]];
-//                case _               => null;
-//            }
-//        }
-//    }
-    
     //implicit def simplePath(s: Object): SimplePath[_] = aliasFactory.getCurrentAndReset();
     
     implicit def entityPath[T](arg: T): EntityPathImpl[T] = {
-        var rv : EntityPathImpl[T] = aliasFactory.getCurrentAndReset();
-        if (rv != null) {
-            rv;
-        }else {
-            arg match {
-                case x:EntityPathImpl[T] => x;
-                case x:ManagedObject     => x.__mappedPath.asInstanceOf[EntityPathImpl[T]];
-                case _                   => null;
-            }
+        val rv = Option(aliasFactory.getCurrentAndReset());
+        rv.getOrElse(arg) match {
+            case x:EntityPathImpl[T] => x;
+            case x:ManagedObject     => x.__mappedPath.asInstanceOf[EntityPathImpl[T]];
+            case _                   => null;
         }
     }    
     
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala
index 496aa550d..28b876d59 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala
+++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala
@@ -25,6 +25,15 @@ object Constants {
     
 }
 
+object Resolver {
+    
+    def resolve(value: java.lang.Integer) = ConstantImpl.create(value.intValue);
+    
+    def resolve(value: String) = ConstantImpl.create(value);
+    
+    def resolve[T](value: T) = new ConstantImpl(value);
+}
+
 trait SimpleExpression[T] extends Expression[T] {
     
     def $eq(right: T): BooleanExpression = $eq(constant(right)); // XXX "is"