Even more cleanup for moved around repos.