(fix) Hack around extended borrow scopes.