[sd2_mr0598] Safer compare.