Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode_EPConstructors4
Merge remote-tracking branch 'origin/refactor-syntax_unicode_EPConstructors4' into refactor-syntax_unicode_EPConstructors4
Added /* UNCHECKED */ where necessary