remove mx macro and add macroexpand-all; tighten up