clean up impl of -takeUntilNext