Use isAuxiliary instead of ExtraValue for the auxiliary subtypes.

Change-Id: Ibce4f884e697ca789b9942cf3abad43741040a87
4 files changed