Update runtime
Tweak parsing rules to properly capture variable reference locations