Address @kwsmith's comments.