More bugs with 'checktype' fixed.