Minor work on decoder.