More cleanups, including decluttering the EventsController using Event scopes.