I agree it is a bit weird. I did consider basing this on observation, but I thought this would be more gentle and understandable for newcomers. Since it seems "scalar-maybes-as-signals" is an antipattern, I'll go with your suggestion of refactoring this in a separate commit.