Fixed some more bugs that were introduced in the refactoring.
Authored by: oconnell@adobe.com 2009-12-09
Parent: [r629]
Child: [r631]