And move UntrackedFile into PopulateUntrackedUploadsDependencies, and move its spec into its own file.