Minor comment and message changes.