Clean up multibyte support

Closes #12