Fixes #930: Add support for self and $this