Making the type map factory fields not static; fixes #436