I'm also OK if we want to break this usage out into a separate pull request.