Removed build warnings for shadowed types