(Issue 326) Code-review changes.