Update to File-utils 0.2 and simplify related logic