Simplify update/insert row logic.
Simplify update/insert row logic.

git-svn-id: ce585deabd469aa5a36056742d4628c42538c503@211 21c2b8b0-c4d0-461e-9b94-4eb597c105ab

taylorhughes/idone-zo,taylorhughes/idone-zo