I think I've addressed this correctly now, but I wasn't sure which subscription to return. Right now I return the subscription from the event loop, but maybe I should return the innerSubscription instead? Didn't find a clear pattern when looking at usages of CompositeSubscription.