add _WITHID variants for the cases where we (apparently?) still need
them.

Change-Id: I3b8290869368487f04ecd93a5f3a717de7fd10b4