Eventually we may want methods like this corresponding to all of the above scopes. But I've limited this pull-request to changes necessary to fix the underlying bug.