Address outstanding comments in the previous PR: https://github.com/patternfly/patternfly-react/pull/8678#pullrequestreview-1411712886