Simplify filesystem natives.
Merge branch 'fs-redux'