Clean filenames and simplify suppression rules.