Remove unused Options class.
Simplify Terminal by removing a bunch of stuff.
Improve 'Collections' code. Sorry, so vague.