MC: Explicity track section and fragment ordinals.