Some more cleaning. Also includes a fix for benchmark building.