Update `expand` to use a `Scope`.