2006-10-16 insilmaril Code simplifications