Massive macro/formatting/etc. cleanup

* Made the JSEither stuff way cleaner, using Marshal more
* Qualified all the imports done by the Ruby code,
  which in turn led to fixes for other imports
* Much better formatting throughout FileSystem