Restructure to force statechange event to run.