Address @kwmsmith'scomments.