More benchmark improvements.