OK.  Things were working, and I touched this codepath somewhere when I made the move away from incremental updates and to absolute updates.  I may have tried to tweak the code, rather than rewrite, and caused the issue.  Either way, that cleaned up nice :)