Ref T13098. I eventually got unit tests sort-of-almost running and they caught these two issues. Since the tests don't get very far with these classtree problems, just fix them up now so when arc unit actually runs later on it can meaningfully run tests.

Ran arc unit, after other changes let it run, and saw fewer "class doesn't implement every abstract method" issues.