Remove invalid spec (we can now never have too many arguments - allows multiword queries).
Extract methods, allow multiword queries.