[#43685585] Refactor Workfile creation.