Update parsers to be more general, add parsing of environment variables from files.