Minor enhancements.
Minor enhancements.
Example cleanup.