Add explicit count flags for machine types