RxJS cleanup

Using the built-in "this" binding that we already provide with RxJS.  Also, using shortcuts such as flatMapLatest to do a select/switchLatest.