Improved support for generic conversions