Make mkDFunUnfolding more robust