Fix review nits

Fixes from rKEcbbd22da129cb8007ff95ff49fed08456856fa93.

Auditors: eater, cbhl