Conform to the correct interpretation of the spec.