Factor vocabulary for new style of regexp