Tidying up TypeConverters