Improvements to t? function.