Unbreak the building of the CEF stuff. Mostly.