Address @Snuffleupagus and @mduan comments.