Revert "mes: un-defmacro optargs. WIP"