Done in an updated commit on my git-integration branch. For some reason, as of this comment, the PR hasn't included that change to the branch yet.