Fix build following latest changes to jmacro