[3.9] Improve readability and style in parser files (GH-20884) (GH-20885)

(cherry picked from commit fb61c42)

Co-authored-by: Pablo Galindo <[email protected]>

Author: pablogsal