fix. self refs in class methods.

Change-Id: I4c5b025edae6b874115d01952692e8d5f64e372a