Fix typo (f 42). Simplify some sub-typing rules.