MAP-312: finishing touches on transaction cleanup.