Make the unicode-escape and the UTF-16 codecs handle surrogates

correctly and thus roundtrip-safe.

Some minor cleanups of the code.

Added tests for the roundtrip-safety.