Both MCfiletype and MCstackfiletype must be updated to MCStringRefs (I think I have already done it in the refactor-syntax_unicode_globals_1 branch (or in the refactor-syntax_unicode_globals_2 branch). So should I change this now, or leave it for later, when sending the new pull request from these branches?