Improve insert and upsert implementation

[tnaum-ms]

The current code is built around using 'upsert' for both insert and update operations. While this was a good idea initially, it now complicates the decision-making process regarding when to generate a new _id and when to reuse an existing one from the state. This approach needs a thorough review and simplification.