Minor cleanup.
Have own macro expander to work around MACROEXPAND oddity.
SYMBOL-NAME has to work with packages.