Deal with a few more cases the test suite didn't turn up
Deal with a few more cases the test suite didn't turn up

--HG--
branch : ast-branch

blueyed/coveragepy,blueyed/coveragepy,nedbat/coveragepy,blueyed/coveragepy,hugovk/coveragepy,hugovk/coveragepy,nedbat/coveragepy,hugovk/coveragepy,nedbat/coveragepy,blueyed/coveragepy,hugovk/coveragepy,hugovk/coveragepy,nedbat/coveragepy,nedbat/coveragepy,blueyed/coveragepy