COMP: Remove shadow declaration warnings