Revamped internal state markers.

(This will cause bugs on running systems but they should be graceful)