Eliminate dependecies on parser internals