Rename things and kill tuples.
Redo annotations.

* Make annotations inline; kill separate annotations.

* Distinguish functions (typed) from blocks (syntactic).

* Make 'if-then-else' syntax, accepting blocks.

* Remove type variables for now. They are still allowed but
  not correctly enforced.
Better naming.