Renamed / refactored.

I'm not seeing a benefit right now to a template method, as you can't even get into a parser without having an original (we detect your parser by contents in the originals) - but next time you touch this (or we pair) I'd be happy to see what you're thinking.