[trunk] First pass to cleanup compare_dump_files