Use this.$ where available

For consistency and to avoid performance hits when moving things
between documents.

Change-Id: I06de6f3f901268ca99a47428173391bea9863524
Merge "Use this.$ where available"