Further refinements for the converter tool.