Bring code in line with C++ and obj-c code.