Reorganize loop in preparation for handling source tracking.
Reorganize loop in preparation for handling source tracking.

clasp-developers/SICL,clasp-developers/SICL,vtomole/SICL,vtomole/SICL,clasp-developers/SICL,clasp-developers/SICL,vtomole/SICL,vtomole/SICL