Clearer conditional in constraint match check