Refactor `type`-ing (specs) rules. Update related tests.