More robust handling of file names and calls.