I’d compress these two OnSubscribe cases into one to reduce the fall-through time for other messages