Use new `tv' macros. Fix ordering bug for timeout selectors.