Some cleanup before adding a feature to the output driver.