Code-review updates.