Better implementation for --use-stdout