Oops, left this out of r8178: having defined COMBINED everywhere in