Deal with some references to the Toolserver in the code/comments.