Added back in Brad's variable name resolution code