tweaks to compile on windows
Merge branch 'refactor-syntax_unicode_shims_windows' into refactor-syntax_unicode_shims