Fix off-by-1 with cxoption.consumption and rename

... and rename to 'cxoption.extra'
Fix bug with successive option gobbled as opt-arg