Use OPT_SET_INT and OPT_BIT in builtin-branch