I had the inheritance cycle stuff backwards.  Oops!
2 files changed