Better filename resolution.