Fixed extension for parsing more complex input strings

Hi Troy,

I'm back from holiday visits this week and have addressed the failing tests you pointed out last time.

The bin/roll tests fail on Windows, but I think that's an issue with the path construction in the tests.

Let me know if there are lingering concerns.

Best,
CAJ