Some cleanups of the examples.