Whitespace and comment fixes from David Rowley
Changed the order of wait_policy tests to be always LockWaitBlock,
LockWaitError, LockWaitSkip.  Based on suggestion by David Rowley.
Cleanup code based on suggestion from David Rowley.  Though I made it
conditional on have_tuple_lock, which I'm not sure about...