CommandLineToolSet is a hack; when properly done it needs to go into Trunk.