Bug fix: remove call-time pass-by-reference.