Upgraded Saltarelle and fixed build.
Cleanup code.
Fix build.
Fix build.