Streamline fs utils code a bit more.