cifs: clean up various nits in unicode routines (try #2)