And clean up the previous improvements.

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

Created by  dolorous  on July 2, 2008
MM6TB2C7FZSQRT5HAUGL2RPYI2P5LNTOZEQBP3QW2P6A7L45RSPAC
Change contents