Support query string separator for all callbacks.

In commit 863a62adaeba56a5f8f74aa0e8f2f9c98f9ba0c2 support for callback uris
with query strings was added, but the default case was not adapted.