Tweaking the rules for 'type'.