Don't add the same clause twice to saved clauses
Use the 'main' versions of the converters