cleanup some crufty cmake code.