Reviewed-by: michaelm, rriggs

Reviewed-by: alanb, khazra, skoivu

Summary: ...and some minor stylistic cleanup
Reviewed-by: khazra, dsamersoff, michaelm

Reviewed-by: darcy, weijun