--- a/core/src/luan/impl/Closure.java	Wed Apr 06 21:47:45 2016 -0600
+++ b/core/src/luan/impl/Closure.java	Thu Apr 07 00:01:10 2016 -0600
@@ -37,16 +37,8 @@
 		return upValues;
 	}
 
-	@Override public Object call(LuanState luan,Object[] args) throws LuanException {
-		try {
-			return call(this,(LuanStateImpl)luan,args);
-		} catch(StackOverflowError e) {
-			throw new LuanException( "stack overflow", e );
-		}
-	}
-
-	private static Object call(Closure closure,LuanStateImpl luan,Object[] args) throws LuanException {
-		FnDef fnDef = closure.fnDef;
+	@Override public Object call(LuanState ls,Object[] args) throws LuanException {
+		LuanStateImpl luan = (LuanStateImpl)ls;
 		Object[] varArgs = null;
 		if( fnDef.isVarArg ) {
 			if( args.length > fnDef.numArgs ) {
@@ -58,20 +50,19 @@
 				varArgs = LuanFunction.NOTHING;
 			}
 		}
-		Object[] stack = luan.newFrame(closure,fnDef.stackSize,varArgs);
+		Object[] stack = luan.newFrame(this,fnDef.stackSize,varArgs);
 		final int n = Math.min(args.length,fnDef.numArgs);
 		for( int i=0; i<n; i++ ) {
 			stack[i] = args[i];
 		}
 		Object returnValues;
 		try {
-			fnDef.block.eval(luan);
-		} catch(ReturnException e) {
+			return fnDef.block.eval(luan);
+		} catch(StackOverflowError e) {
+			throw new LuanException( "stack overflow", e );
 		} finally {
-			returnValues = luan.returnValues;
 			luan.popFrame();
 		}
-		return returnValues;
 	}
 
 }