Clean-up TransactionFailureException in reponse to PR comments.