Switch (in types) to the new spec.