FIX: Cleanup examples

Misc cleanups we've missed in other PRs. Ready for review/merge @drammock or @rkmaddox.