Fix some additional -DUNICODE issues on win32. Brodie's patch didn't catch the ones that were new since 1.4.