Gittrac #1782:  Oops -- one more cleanup.