Moving away from use of "this".

Previous technique was preventing progress.