Improved regular expression.