Apply kotk's minor fixes patch in [2827129], with minor tweaks.

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

Created by  dolorous  on July 25, 2009
C6MH4LDQPKAAPQJT4HZLZHN536KELAMM26NY2T63GIFOGDPSSVMAC
Change contents