urls.encoding: more cleanup.