Better support for unbounded scopes.