Improve comments for r211040