Reorder calls and remove calls that are no longer needed.
Reorder calls and remove calls that are no longer needed.

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