Refactored further to work with ReactiveCocoa 2.0 changes.