Updated code to accommodate changes after refactoring.
Authored by: jwjoubert 2009-06-27
Parent: [r7559]
Child: [r7561]