Integrate utf-16 encoding; small encoding cleanup.