Address feedback for commit f7c0d3d on pull request 24.