Issue #222: Fix comments from feedback.