Improved type safety of SurfaceClosureUnion a bit.