Some changes to CaseConverter to deal with possible case ambiguities.