Improve comments for both parsers and bring more in sync.