Cleaned up TreeCapitator support code and added new trees

Hopefully this code is more maintainable than what was there before.