Optimize the decoder a little