fix options splitting and merging to not lose some kwargs

if we passed certain options after passing global override options (ie. passing an image spacing option before passing a repetition option), the first global override option was lost
don't use the same name for a local variable as we use for an instance method, that's just confusing