Replace the OP_IsUnique opcode with OP_NoConflict.  This code simplification
might be useful to move onto trunk even if this branch is never merged.
Work on the UPDATE and INSERT logic.  This is an incremental check-in so that
can switch over to trunk to work on an unrelated issue there.