Clean up code comments a bit.
Merge in github.