971b2fa43 Give "macro" REPR same treatment as WHO and friends