Cleaned some code up (a very small amount), about to merge with Marc's
changes.