Code hygiene and preparation for promotion to an installed header file.
Authored by: sms00 2007-05-15
Parent: [r3188]
Child: [r3190]