Extending the geometric phase formalism to cycles with isolated degeneracy points and how to implement finite size scaling in the modern polarization theory