Improve comments in last patch.