Refactor #users_for_new_watcher_with_groups