[MAT-387] More const refs, simplify runtree cleanup