Imo, what we really need is support for Critic Markup, either in core or via a plugin. There’s a feature request here.
cc @Bluemoondragon07