Make ContentStreamParser members private, fix constructor