Replace return macro in trill.c with goto.  Hooray!