Merge "Replace use of &$this"