Use abortUnlessCommitted() where appropriate