Only include in output when you have to