More example cleanup.