It is already required along certain code paths that the CondTy is valid. Fix some of the uses to make sure it is passed.