Code changes based on code review feedbacks.
Authored by: weizhang@adobe.com 2009-10-27
Parent: [r376]
Child: [r378]