Improve readability of definitions in the state resolution v2 algorithm.