Bug fix and simplification


git-svn-id: svn://svn.r-forge.r-project.org/svnroot/tm@1304 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
Simplify


git-svn-id: svn://svn.r-forge.r-project.org/svnroot/tm@1305 edb9625f-4e0d-4859-8d74-9fd3b1da38cb