Cleaned up some more.
Note that cycle-retain of Table issue fixed a few commits ago.