Good question, I think you're right that that's an area where the spec is not clear. 

I mostly took this on as a quick branch to fix some clearly buggy behavior with underscores, so I wouldn't want to hold it up for that, but we should start a ticket there.