More aggressive file name scrubbing.