Argument tokens should only match a-z, A-Z, 0-9, _ and -. \w was too broad. Also, I place `-` and `.` as leading characters when matching as a character out of habit. Do you feel they would be better suited at the end?