Clean up a little logspam

Don't claim we're going to rety the transaction when we're not
really going to.  Also avoids needlessly regenerating order id
and restaging data. Also fix doc comment on previous test.

Change-Id: If1028bd0ad53a09081eb2bec439f3b86e771b775