Some more defcfun changing