Kind checking bugfix (#4356) and preventing wanteds from rewriting wanteds