After internetting for a bit, it seems like the Better Fix (tm) for this is to change this line to `typedef ::String String;` and revert all other changes to this file. Does that work?