Cleanup and simplify TPC code.
Add autorm and echo options to the tpc directive.