Even more BB parser tweakery