Humm, undo some shuffling

In preparation for adding more advanced unicode funcs.
4 files changed