Fixing returns that need escapable scopes.