Two minor fixes in parser.rs

Improve comments for the helper macros, and clean up variable names in those macros.