After more testing, put back two cleanups from before that don't break

anything.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5996 c06c8d41-db1a-0410-9941-cceddc491573

Created by  dolorous  on June 20, 2008
N6T37UJDDZGBAHC7UZY72ONUDSEGLNBPGFXUB5SWK2DZVPWYCIRQC
Change contents