remove a few more straggling references to 'tool'