Update EncodedString and spec with recent changes.