Integrate Sascha's changes re: const correctness and fileName.isEmpty()