Turn state into a proper concept