fix-again #221: Outer scope gets shadowed ...