Some cleaning up of our file manager code [ci skip].