Switch away from tagged descriptions.

These lead to more complicated type signatures that
are not useful for presenting the paper.
Renaming