Soul Tree gen code cleanup.