Normalized to Decoder.TextStream and Encoder.Text; replaced Map bindings with Set