Improvements courtesy of Scott Turner

git-svn-id: https://svn.cms.waikato.ac.nz/svn/weka@11289 e0a1b77d-ad91-4216-81b1-defd5f83fa92