Better regex.  Still a couple substrings.