Refactor syntax unicode property keywords

I think this is ready to merge into shims (if you could have a quick check that it doesn't break things too, that would be great) :)