Some more cleaning up of the examples.