Optimize decoder a bit
7 files changed