Loosen a bit the 'has same type' assert. The new implementation drops the cvr quals when comparing.