Deal with yet more bootstrap flailing on filenames.