Updated evaluation of cond-expressions