Address post-review comment from dblakie.