Add -stdout flag and sort types to reduce diffs.