tdb2: make tdb2 compile clean under -Wshadow.