Reapply correct optimization for simplifiying fill_surfaces before performing the offset. #1325