Follow up r62436 comments.