Merge "edify: Move State.script and State.errmsg to std::string."