Removed COMPILER-MACROEXPAND functions, not needed.