Address Duncan's comments on r164684: