* Replaced all previous resolve methods with resolve, resolve_var, resolve_to_list, resolve_var_to_list.