Don't lose the content_type (_, not -)
Keep a bit more of the OFT path for mergers