We just changed this the other day so we can guarantee the invariant that the RHS of a constraint should always contain either kvars or concrete preds, but never both. Can you revert this change and use `subC` and `wfC` instead?