Integrate API changes from spec review.
Authored by: briggs@adobe.com 2009-09-16
Parent: [r167]
Child: [r169]