More cleanup in examples.