Improving state name propagation.