refactor jmacro operators and remove some unused bits