Use proper C++ now that named macros require it.