Be explicit about using unicode
Redo argyument handling