It turns out we don't need all those parentheses in the regex. Plus a little bit of cleanup.