Allow underscores here too

Looks like I missed a spot where we may need to define underscores as valid. I put a TODO in there for extracting this regex somewhere as well - any suggestions how you'd want that implemented?