Make some more classes in Parser to be private