Revert to use defparameter
Reorder build dependencies