Mostly printout cleanups.