Address comments from @millermedeiros.