Tweak a few commented-out diagnostic print statements