Item13127: More changes to spec definitions.