Terminal elision

Eliding tokens when their source terminal's key is surrounded by angle
braces.
Refactoring

Changing around some namespacing to make things a little more
reasonable (I hope?)