More cleanup on some of the examples.