Improved regexp matching of ...*