Preliminary work before the repo rename, just to introduce the macro.