Minor improvement to our File class. Also some minor cleaning up.