This regex will likely always be maintained in step with the NAME_RX regex. The reason I've kept them together is so they can be maintained in-line. I think this is more important than the fact it's only used once in the code.