Renamed things and readjusted to hopefully make it simpler and easier to grok.


git-svn-id: http://scalatest.googlecode.com/svn/trunk@4999 fd1274fd-080f-5963-8033-43ee40fcd1de