Further merge StateInfo setup functions

No functional change.