Use the regex parts recommended above in this regex, too.