This doesn't really fix anything, it just makes the value analysis
easier. I don't feel strongly about it.

/Tomas