Add --output-format where applicable