Fixing removal of pass-by-ref &s.