Couldn't we just replace the whole thing by URI.unescape ?