Fix-up parenthesis, organization, and NULL check (GH-9297)

1 file changed