Merge "Reduce cost of span type checking" into mnc-dev