Move the BMax test up a bit.
Make parsers re-initializable without too much effort.