[MAT-387] Make some things const refs