Fix defer-out-of-scope-variables