Update to work with Formatter changes.
A hack to support StrBuf.

The real fix should probably be using StrBuf throughout the parser.