A little better, eh?
Temporary hack for running tests.
A little cleanup.
Add missing type signatures for top level elements.
Cleaning up warnings and whatnot.