d2: de-unify all variants

Change-Id: I88e29cc71993f87fa0f28c570dcdb7700291a83c