[jdk17u-dev] RFR: 8274233: Minor cleanup for ToolBox

[Goetz Lindenmaier]

I backport this for parity with 17.0.4-oracle.

-------------

Commit messages:
 - Backport e741a18062061c1959f7881503aaf3a4cbcae776

Changes: https://git.openjdk.java.net/jdk17u-dev/pull/228/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk17u-dev&pr=228&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8274233
  Stats: 111 lines in 1 file changed: 47 ins; 12 del; 52 mod
  Patch: https://git.openjdk.java.net/jdk17u-dev/pull/228.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk17u-dev pull/228/head:pull/228

PR: https://git.openjdk.java.net/jdk17u-dev/pull/228