Move scopes to class methods

This is functionally identical, but lets us track whether they're
actually used.