Refactor evm_set/get_state(). Update EVM state enums.