Comment changes per #3645 review