Fix #9: Rip out old-style TRACE; add -t, -x options