Don't rely on *old* tw2 code.  Fixes #1.