Simplify old filesystem API in preparation for converting it to a wrapper