Tweak to use an immutable DecoderFactory...