Used new macro to factor code.
Used new macro to factor code.

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