A little more scidb.c cleanup