Fix %20 nonsense with multi-token strings in Firefox. Closes #916.