Arguments type are now File, more cleanup, test of parents too.