More restructuring of Bible internals, plus a couple of annoying new bugs fixed