Cleaned up the File API a bit.