Merge "Fix a bunch of call-time pass-by-reference errors"