Fix review nits and flake.