fix tdata1, drop tdata3: the previous implementation was clearly broken

Replaced with a slightly less broken version

tdata3 is optional.  We should have a better way of supporting
different configurations, but it's safe to drop for now.