Update for the new Encoder/Decoder API.