However, it still looks like I'm looking at littering my grammar with all the places comments can occur.
It may be that I'm thinking about this wrong in trying to parse code and comments in a single pass with the same parser. The Right Thing may be to parse code in one pass and doc-comments in another.