More Soul Tree gen code cleanup, ready for modification.