Removed a bunch of unnecessary 'this.' again.