Clean up some comments, minor diganostics, no code changes.