Support for event sources in extended form

Adds watch for changes to events supplied as event source in extended
form.