MC-116: Spec normalizers