Cosmetic changes regarding file open handling