More printing cleanup.