(In my brief scan it looks like we can turn these into const references.)