Address @kwmsmith's comments.