SI-6678 Make currentMirror macro hygenic

I was bitten by the lack of hygiene here, so I thought I'd submit a patch.