Some cleanups based off data from flake.