Index: src/Validate/Autogen.cpp
===================================================================
--- src/Validate/Autogen.cpp	(revision c75b30ae4d3f97678f27275a033614f675b7fdaf)
+++ src/Validate/Autogen.cpp	(revision 496ffc17cf8822f6bee4aed86e97230a1b3a0776)
@@ -751,22 +751,9 @@
 		 * returns to zero.
 		 */
-		auto dstExpr = new ast::VariableExpr( location, dstParam );
-		const ast::Expr * srcExpr;
-		if ( decl->base ) {
-			srcExpr = new ast::ApplicationExpr( location,
-			ast::VariableExpr::functionPointer( location, genPosProto() ), 
-			{
-				new ast::VariableExpr( location, srcParam )
-			}
-			);
-		} else {
-			srcExpr = new ast::VariableExpr( location, srcParam );
-		}
-
 		auto callExpr = new ast::ApplicationExpr( location,
 			ast::VariableExpr::functionPointer( location, functionDecl ),
 			{
-				dstExpr,
-				srcExpr,
+				new ast::VariableExpr( location, dstParam ),
+				new ast::VariableExpr( location, srcParam )
 			}
 		);
Index: src/Validate/ReplacePseudoFunc.cpp
===================================================================
--- src/Validate/ReplacePseudoFunc.cpp	(revision c75b30ae4d3f97678f27275a033614f675b7fdaf)
+++ src/Validate/ReplacePseudoFunc.cpp	(revision 496ffc17cf8822f6bee4aed86e97230a1b3a0776)
@@ -128,5 +128,4 @@
             location, ast::ConstantExpr::from_string(location, mem->name)));
     }
-    // Values only
     if (queryValues.count(enumDecl->name)) {
         auto init = new ast::ListInit(location, std::move(inits));
@@ -166,5 +165,5 @@
     auto untyped = new ast::UntypedExpr(
         location, new ast::NameExpr(location, "?[?]"),
-        {new ast::VariableExpr(*arrAsVar), new ast::VariableExpr(*arg)});
+        { std::move(arrAsVar), std::move(arg) });
     auto typedResult = ResolvExpr::findVoidExpression(untyped, context);