More sensible output processing