Bug fixes and define compiler-macroexpand.