Addresses review comments: * https://github.com/openjdk/jdk/pull/20395#discussion_r1698616433 * https://github.com/openjdk/jdk/pull/20395#discussion_r1698618637