Fix NaN similarity
SImplify NonTransactionalRedisCFState