Some more refactoring to make multiplexed notifications easier