univ minimization: use shadowing more
univ minimization: use shadowing more

This avoids having multiple highly similar things in scope when we
only want one of them.

ejgallego/coq,ejgallego/coq,maximedenes/coq,Zimmi48/coq,ppedrot/coq,gares/coq,Zimmi48/coq,maximedenes/coq,silene/coq,Matafou/coq,SkySkimmer/coq,silene/coq,coq/coq,SkySkimmer/coq,silene/coq,ppedrot/coq,JasonGross/coq,JasonGross/coq,JasonGross/coq,coq/coq,ppedrot/coq,ppedrot/coq,SkySkimmer/coq,ppedrot/coq,Zimmi48/coq,SkySkimmer/coq,gares/coq,Zimmi48/coq,coq/coq,maximedenes/coq,gares/coq,ejgallego/coq,JasonGross/coq,coq/coq,ejgallego/coq,maximedenes/coq,Matafou/coq,maximedenes/coq,Matafou/coq,gares/coq,gares/coq