Use http-types' urlEncode.
Cleanup.
More cleanups.