Minor UTF8UrlEncoder clean up, see #600