Merge branch 'nd/use-opt-int-set-f'

Code simplification. * nd/use-opt-int-set-f: Use OPT_SET_INT_F() for cmdline option specification