[Typer] unification branch

Just a heads up: I'm about to merge the unification branch into `master'. It's not working perfectly yet, but it's no worse than the general state of affairs. Stefan