Small INFILE refactoring