Switch from IEvent to IObservable where possible