Unicodification. Small cleanups.