Minor points from review: https://github.com/tendermint/tendermint/pull/1286#pullrequestreview-103093019