Two more bits of output cleanup