Fixups with variable handling in the ::mirror and ::repo defs