am a9995c98: (-s ours) Fixes and cleanup for transactions.

* commit 'a9995c98ba99bcdd101bc4734fdb3ff08e9efe8f':
  Fixes and cleanup for transactions.