Extend store merging to support the 'if/then' version in addition to if/then/else.