Better shorthand for self reference

Change-Id: I5de73def5ed50287ce4ac5e47d7c608522bf6223