Respond to code review feedback -- to be squashed.