Extract TypeRewriter
Add plural type back to specialize