A few more minor improvements in the --info/--debug code.