[BUGFIX beta] Refactor buffer to be simpler, single parsing code-path