Move term() into to_ascii() as "terminator" kwarg; fix bad terminator handling