I'd kind of like for us to get rid of this pattern — it's far too clever IMO. I can buy it's better to do it as part of a separate PR though.