Fix -f FORMAT option handling