Simplify the decoding a bit.