Further simplification of regexp.