Attempt to define AVT and TVT; removed spurious FIXME: