Address @alandau and @andrewcox's comments.