Always build "what" from the original tokens.

We were already using the original tokens when a connector is present.
We now use the original tokens for connector-less queries, too.