Clean up comments a bit more.