config: Address review comments.