More output cleanup.