Windows is being a bit silly about case, so cleanup will take a few commits.