Fix code repetition for Decoder.