Cosmetic changes to file_compare() for readability and to