Don't suggest things you've already said are great for nitpicking

I'm actually wondering if this could do with getting refactored into "scopes" or something?

This should close issue #995.