Improve parsing of varlist files