Refactored `of a kind` #18