Tidied up unused variables, added serialVersionUIDs as appropriate,
removed a few unnecessary casts and brackets and exceptions.
Authored by: cix_foo 2006-04-21
Parent: [r2300]
Child: [r2302]