Fixes #833: Use FileSystemHelpers.Instance for FileSystem singleton.

Fixes #833. Removes FileSystem in arguments and use FileSystemHelpers.Instance instead.