Merge "Don't use $this as a function argument"