ENG-5595 txnid2: addressing John's comments