Pre-RSS-14 changes. Necessary code changes, but not the decoder. Committing this...