Changes generally made to be consistent across the board with our usage of new File abstraction.