ucimap: cleanup OPTMAP_OPTION macro, rename to UCIMAP_OPTION