Remove call-time pass by reference