--- a/core/src/luan/impl/LuanParser.java	Thu Apr 07 15:11:52 2016 -0600
+++ b/core/src/luan/impl/LuanParser.java	Thu Apr 07 17:06:22 2016 -0600
@@ -177,10 +177,15 @@
 	private FnDef newFnDef(int start,StmtString stmt) {
 		if( !stmt.hasReturn )
 			stmt = new StmtString( stmt.code + "return LuanFunction.NOTHING;\n" );
-//		return new FnDef( toExpressions(stmt), frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) );
 		return toFnDef( stmt, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) );
 	}
 
+	private ExpString newFnExpStr(int start,StmtString stmt) {
+		if( !stmt.hasReturn )
+			stmt = new StmtString( stmt.code + "return LuanFunction.NOTHING;\n" );
+		return toFnExpStr( stmt, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) );
+	}
+
 	FnDef Expression() throws ParseException {
 		Spaces(In.NOTHING);
 		int start = parser.begin();
@@ -188,6 +193,7 @@
 		if( expr != null && parser.endOfInput() ) {
 			String code = "return " + expr.code + ";\n";
 			StmtString stmt = new StmtString(code);
+			stmt.hasReturn = true;
 			return parser.success(newFnDef(start,stmt));
 		}
 		return parser.failure(null);
@@ -353,8 +359,8 @@
 			var = indexVar( var.exp(), exp );
 		}
 
-		FnDef fnDef = RequiredFunction(In.NOTHING);
-		return parser.success( var.set(new ExpString(fnDef)) );
+		ExpString fnDef = RequiredFunction(In.NOTHING);
+		return parser.success( var.set(fnDef) );
 	}
 
 	private StmtString LocalFunctionStmt() throws ParseException {
@@ -363,9 +369,9 @@
 			return parser.failure(null);
 		String name = RequiredName(In.NOTHING);
 		addSymbol( name );
-		FnDef fnDef = RequiredFunction(In.NOTHING);
+		ExpString fnDef = RequiredFunction(In.NOTHING);
 		Settable s = new SetLocalVar(symbolsSize()-1);
-		String code = new SettableString(s).code + ".set(luan," + new ExpString(fnDef).code + ");\n";
+		String code = new SettableString(s).code + ".set(luan," + fnDef.code + ");\n";
 		return parser.success( new StmtString(code) );
 	}
 
@@ -828,25 +834,25 @@
 
 	private ExpString SingleExpr(In in) throws ParseException {
 		parser.begin();
-		Expressions exp = FunctionExpr(in);
-		if( exp != null )
-			return parser.success(new ExpString(exp));
-		ExpString es = VarExp(in);
+		ExpString es = FunctionExpr(in);
 		if( es != null )
 			return parser.success(es);
-		exp = VarArgs(in);
+		es = VarExp(in);
+		if( es != null )
+			return parser.success(es);
+		Expressions exp = VarArgs(in);
 		if( exp != null )
 			return parser.success(new ExpString(exp));
 		return parser.failure(null);
 	}
 
-	private Expr FunctionExpr(In in) throws ParseException {
+	private ExpString FunctionExpr(In in) throws ParseException {
 		if( !Keyword("function",in) )
 			return null;
 		return RequiredFunction(in);
 	}
 
-	private FnDef RequiredFunction(In in) throws ParseException {
+	private ExpString RequiredFunction(In in) throws ParseException {
 		int start = parser.begin();
 		RequiredMatch('(');
 		In inParens = in.parens();
@@ -870,7 +876,7 @@
 		Spaces(in);
 		StmtString block = RequiredBlock();
 		RequiredKeyword("end",in);
-		FnDef fnDef = newFnDef(start,block);
+		ExpString fnDef = newFnExpStr(start,block);
 		frame = frame.parent;
 		return parser.success(fnDef);
 	}
@@ -1587,7 +1593,7 @@
 
 	private static StmtString EMPTY_STMT = new StmtString("");
 
-	static FnDef toFnDef(StmtString stmt,int stackSize,int numArgs,boolean isVarArg,UpValue.Getter[] upValueGetters) {
+	private static FnDef toFnDef(StmtString stmt,int stackSize,int numArgs,boolean isVarArg,UpValue.Getter[] upValueGetters) {
 		int i = LuanImpl.addObj(upValueGetters);
 		String className = "EXP" + ++classCounter;
 		String classCode = ""
@@ -1609,6 +1615,7 @@
 			+"}\n"
 		;
 		try {
+//System.out.println(classCode);
 			Class cls = LuanJavaCompiler.compile("luan.impl."+className,"code",classCode);
 			return (FnDef)cls.newInstance();
 		} catch(ClassNotFoundException e) {
@@ -1620,6 +1627,20 @@
 		}
 	}
 
+	private ExpString toFnExpStr(StmtString stmt,int stackSize,int numArgs,boolean isVarArg,UpValue.Getter[] upValueGetters) {
+		int i = LuanImpl.addObj(upValueGetters);
+		String classCode = ""
+			+"\n"
+			+"new FnDef("+stackSize+","+numArgs+","+isVarArg+",(UpValue.Getter[])LuanImpl.getObj("+i+")) {\n"
+			+"	@Override public Object run(LuanStateImpl luan) throws LuanException {\n"
+			+"		Object t;\n"
+			+"		" + stmt.code
+			+"	}\n"
+			+"}.eval(luan)\n"
+		;
+		return new ExpString(classCode,true,false);
+	}
+
 
 	private static class SettableString {
 		final String code;