Port cleanup after feedback in PR 193960