minor output cleanups. #3594