Fixed C++ expansions