Gittrac #1782:  Minor fixes after code review by Nathan.