Tighten up parsing of ListQuery type.