Make the handling of output and input formats consistent