Removed more deprecated pass by refs.