Tweaks to type_rules.v