Finally! Fix up prefix and suffix identification from filenames.