Address @takluyver's comments.