Major refactoring bringing CONSEL/TREE-PUZZLE functionality in line with other executable class definitions.