Fixed some evolution screwery; mostly B&W fallout. #364