Greatly improved robustness of inf file reading and parsing