Gittrac #3834:  Fixed comments as per code review by Jaime.