Resolved one of the Delaunay FIXMEs.