Draft revisions for the entropy coder.