Subscriptions cleanup

Some things I missed in previous commit and am cleaning up related to https://github.com/Netflix/RxJava/issues/173