Do we want to use `&$this` consistenly everywhere?