Cleanup in Decoder code.