Address @Snuffleupagus comment.