InputParser: creep towards being a class a bit more