Reviewed-by: xdono

Summary: Avoid *Critical; fix compile warnings; improve readability
Reviewed-by: alanb

Reviewed-by: darcy, weijun