hopefully all the handling of eager execution can go away with the retry / status update reordering