There are a couple of other places in this PR where this can be applied