[MAT-387] Make more things const refs