#2071 minor refactoring of TableFileParser (let's see if the unit tests pass..., today I'm daring...)