Fix build:  invoke correct factory when unmarshalling key from pb.