We must ensure that we always use the ASCII-String (URL-encoded)
everywhere.

Refactor code a bit to make it possible to add a testcase.

Fixes #1912.