Refactor syntax unicode property keywords

I think this is ready to merge into shims :)