Address @Snuffleupagus, @mduan, @jviereck comments.