(#4712, #4714)  Remove obsolete #ifdefs, change a dprintf() level to match the others.