Tweaks to type definition interpretation