Fix OPAL-2348: $this has really poor performance