Apply changes of b115c984a (More cleaning up of the class examples, 2014-05-05) and other similar commits to the header in this branch too.
b115c984a