Correctly dealing with pre-initialized state.