No longer need the "$that = $this" workaround