ref: 3cc5b92c6516aac4c3f9bf27974bd8543b286251
parent: 583f2d8fc7edeaf9d8eec5b928a485334a5b8544
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Feb 24 18:27:59 EST 2012
Further code simplification and clean up. Change-Id: Ifdb17b56090a317b2aa82cf125d57934902c5298