Change ~str to StrBuf, and resulting fallout, plus some lexer tweaks