Keep removal of ev_attr to strictly mechanical changes.