Merge branch 'refactor-syntax_unicode' into refactor-syntax_unicode_findstack

Conflicts:
	engine/src/dispatch.cpp
Fix errors and oversights
Yet more (attempted) fixes
More corrections
Fix a potential assertion failure
Replace an incorrect check for an empty string
Merge branch 'refactor-syntax_unicode_findstack' into refactor-syntax_unicode_findname

Conflicts:
	engine/src/dispatch.cpp