cull WCHAR_T pp blocks, tidy up printing and scanning