- Split out macro stuff from common.lisp