Fixed up benchmark routines.