Simulation of two-dimensional quantum systems on an infinite lattice revisited: Corner transfer matrix for tensor contraction