Very much a stretch goal, but another infrastructure work that could go on in parallel with addressing code issues is setting up https://google.github.io/clusterfuzzlite/ to test for very unexpected behavior on abundant input.