clhep: properly handle CLHEP from ATLAS