Fix variable derefences not being picked up as arugments