diff --git a/Assets/Cryville/Crtr/InputProxy.cs b/Assets/Cryville/Crtr/InputProxy.cs
index a04ff62..5b06440 100644
--- a/Assets/Cryville/Crtr/InputProxy.cs
+++ b/Assets/Cryville/Crtr/InputProxy.cs
@@ -128,8 +128,8 @@ namespace Cryville.Crtr {
 			var def = _ruleset.inputs[target];
 			if (def.pass != null) {
 				foreach (var p in def.pass) {
-					_arbop.Name = _var_value;
 					_etor.ContextCascadeInsert();
+					_arbop.Name = _var_value;
 					_etor.Evaluate(_arbop, p.Value);
 					OnInput(id, p.Key);
 					_etor.ContextCascadeDiscard();
diff --git a/Assets/Cryville/Crtr/PdtEvaluator.cs b/Assets/Cryville/Crtr/PdtEvaluator.cs
index d0695ec..aa3cc77 100644
--- a/Assets/Cryville/Crtr/PdtEvaluator.cs
+++ b/Assets/Cryville/Crtr/PdtEvaluator.cs
@@ -115,7 +115,6 @@ namespace Cryville.Crtr {
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("min"), new func_min(() => ContextSelfValue));
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("max"), new func_max(() => ContextSelfValue));
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("abs"), new func_abs(() => ContextSelfValue));
-			_ctxops.Add(IdentifierManager.SharedInstance.Request("in_area"), new func_in_area());
 		}
 		static PdtEvaluator() {
 			_shortops.Add(new PdtOperatorSignature("@", 2), new op_at_2());
@@ -136,6 +135,7 @@ namespace Cryville.Crtr {
 			_shortops.Add(new PdtOperatorSignature("!", 1), new op_not_1());
 
 			_longops.Add(IdentifierManager.SharedInstance.Request("frame_seq"), new func_frame_seq());
+			_longops.Add(IdentifierManager.SharedInstance.Request("in_area"), new func_in_area());
 		}
 		#region Operators
 #pragma warning disable IDE1006