Sync with changes in lib. Make more strings const.
12 files changed