OM-198: unintuitive state merging

An instance's state override :init-state option, implement more
intuitive behavior.