Simplified and cleaned up result retrying which also fixes odd deadlock behavior in test.