[Parser] More updates to storing variables on update/used maps