Cosmetic changes to fs.c and fs.h