Fix container spec cleanup; nwc10++.