More LeadMarginSpan support