Small cleanup, encode-only still works.
More cleanup, yet encode-only still appears to work.
Fingers crossed.