Additional code cleanup (see comments on issue #56)

regexp.go

@@ -249,14 +249,12 @@ func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route)
 		}
 	}
 	// Store query string variables.
-	if v.queries != nil && len(v.queries) > 0 {
+	rawQuery := req.URL.RawQuery
-		rawQuery := req.URL.RawQuery
+	for _, q := range v.queries {
-		for _, q := range v.queries {
+		queryVars := q.regexp.FindStringSubmatch(rawQuery)
-			queryVars := q.regexp.FindStringSubmatch(rawQuery)
+		if queryVars != nil {
-			if queryVars != nil {
+			for k, v := range q.varsN {
-				for k, v := range q.varsN {
+				m.Vars[v] = queryVars[k+1]
-					m.Vars[v] = queryVars[k+1]
-				}
 			}
 		}
 	}

route.go

@@ -152,11 +152,9 @@ func (r *Route) addRegexpMatcher(tpl string, matchHost, matchPrefix, matchQuery
 	if err != nil {
 		return err
 	}
-	if r.regexp.queries != nil {
+	for _, q := range r.regexp.queries {
-		for _, q := range r.regexp.queries {
+		if err = uniqueVars(rr.varsN, q.varsN); err != nil {
-			if err = uniqueVars(rr.varsN, q.varsN); err != nil {
+			return err
-				return err
-			}
 		}
 	}
 	if matchHost {