I seem to have worked around the big nasty evil database bug. And how, you may ask? By adding a completely extraneous commit into the middle of the hierarchy parsing code. ARGH. There's no reason for it to help, there's no way it should change anything. It's just some silly locking artefact where a SELECT is pointlessly preventing an update.

Blah.