Rename iterator->step.  Remove txnid from key. #1106