Reorder file loading and fix define-setf-expander