Tree spec cleanup.