Changes based on @dpoirier's comments.