Small tweaks to example code, and cleanup TODO a bit.