Align code around char/wchar_t types