More work on the decoder.