Address Duncan's comments on r167121.