Broken again! How do you make these pass?

This is the point at which your suggestion of compound matchers may be
necessary. Or can you find a simpler way to do it? They held up well for
identifiers so far... What about some more complex items?
Made named comments work
Merge branch 'broken_whip_rebased'