Use pabs' trick from r558 to fix the tool names in the 'state' menu.