Refactor item scopes.