More tweaks to nbtinsert.c