Arrow functions now bind 'this'

Change-Id: I3d6c32499f31dbaa9c6a56f4c9a4de1731b42f26