Added faster var_loc creation on substitution