continuation of cleanup from issue 279 [follow up from rev2355]

git-svn-id: svn://svn.code.sf.net/p/rdkit/code/trunk@2364 a5045d30-4826-4484-9c7f-6e55a06ddc77