Sergey, thanks for looking over the original patch.  The incremental
patch is attached.