Fixed some recently/accidentally introducted -Wshadow warnings

While looking at this code, also changed some int to vtkIdType. As ints, some values were potentailly being truncated.