Make Fileset and Result creation idempotent.