Address @markkness' comments.