Proper C++ in tutorials, now that names macros require it.