Some cleanup on the run-away open files fix