Code changes from MAST code review.
Authored by: cnewman@akamai.com 2009-09-29
Parent: [r262]
Child: [r264]