upstream API changes
do not parse sources twice

the importer already parses sources if it needs to
Move "empty interface" check into outer loop to improve performance.