Re-write CorsFeature to more closely follow the specification.