Address Duncan's comments on r164682: