Update states and fates relation to the spec

The recent simplification has made state explicit and fate implicit, instead of the other way around.