Different semantic changes to get rid of all the warnings shown by eclipse.
Authored by: keess 2007-02-10
Parent: [r1607]
Child: [r1609]