Make new geometry class compile against master