Removed eqType assumption on states.