Although this is an external contribution, clean up anyway to stop seeing it in global searches for typical flaws.