Minor simplification on the regex.