Code-review related cleanup.