Convert a few more fs calls to files.*