undo most of previous regex -> end_with? substitution...

regex was needed for multiple input-file formats.