Backport of revision 1.10 changes into 2.2 branch: Remove the static attribute to some variables which are accessed from non-static context and should not be shared between instances of the Tool. Found by Peter Courcoux <peter@courcoux.biz>