Remove infer-heading and type-safe