Added vanicat's multii file extensions.

There was a strange interact with some more recent parts of the code that exposed bugs I hadn't seen before.