Updated C++ rules.