Suggested revisions to PR 13676.

Pull in pnkfelix's recommendations.