Remove use of call-time pass-by-reference