A few more changes to handle globbed file lists correctly.