Another round of changes related to decoding.