The last tweak to the encoding, before I start refactoring.