Adapt t/fill.t to the new infill internal API