added support for 'ExpThis' handling