Clean up terminal echo.
Change terminal echo specs.
Clean up logic and remove trivial accessors.
Change terminal specs to use new syntax.