Code simplication and cleanup.

Simplify some code and cleanup compiler warnings.

Change-Id: Ib6734421d569d281056553b76efaf0a0d17cf137
10 files changed