Re: Cleaning up warnings (issue1807042)

[jasvir]

Better yet - syncing to head removed all that guff anyways.  I'll commit
unless someone objects.

http://codereview.appspot.com/1807042/show