See comment below. As there are a bunch of these, perhaps a separate issue + PR is better for cleaning up the existing places.