Make recursive identifiers less opaque

Change-Id: I921941d2c155d5e586bdf7c818a83e1850ef1c62