Further C++ spec update