Further tweaks to type converter usage