No longer a nsIFile, also update other arguments