Add control of -o vs -O option with incremental mode.