Turned the code that re-adds the webmention comment type into a plugin - I'm looking to separate out as much from functions.php as I can. It relies on the indieweb Semantic Linkbacks plugin so need to add a check for this.