FileSys cleanup

Clean up according to the coding style, and remove redundant namespaced names.
Since this is a style-cleanup PR anyway: Fix this so it follows the rest of the codebase for the initializer spacing.