Making old and new Factory code more coherent.
Authored by: clitte_bbt 2006-11-24
Parent: [r787]
Child: [r789]