Make the diff_options bitfields be an unsigned with explicit masks.