ENH: tidy up cube wrapper for gridfill