Added support for starred matches.