more xregexp adapt.