Clean up.
Added support for '?' trace flip/flop.