Code cleanup and changes after code review.
Authored by: cnewman@akamai.com 2009-12-09
Parent: [r614]
Child: [r616]