Thanks for the new diff, I haven't had time to review fully but from a quick read through this is looking much better.
I noticed tokyocabinet though - I would recommend caution there as it is does not appear to be fully safe on a non-UBC system like OpenBSD. qdbm is better behaved in this respect.
