Further simplify takeUntil