Got rid of thread-expr.