Use fully-qualified types more often in conversions