config: Fix review comments.