Address @bgrant's comments.