One of the change sets to support the new kind "None" seems to have gone missing; here it is (again?)