Attempt to define AVT and TVT; removed spurious FIXME:
Merge pull request #125 from ndw/avt-tvt

Attempt to define AVT and TVT; removed spurious FIXME: