Remove ref to @CXX@