Sync with the latest WString class