Switches to S4 trees. Makes tree-building work (finally).