Flip order of options so identity id etc can be overridden.