Merge "Improve type hints in parser related classes"