Restructure XCBWaitForReply to eliminate two gotos.