Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking