WIP: Clean up the 'context_updated' event.

Let you add 'context_updated' event instead of directly calling add_to_scope.