refactor: address JDT warnings "hiding" #571

All 174 tests pass in 2m 32s

174 tests +174 174 ✔️ +174 2m 32s ⏱️ + 2m 32s
  23 suites +  23     0 💤 ±    0
  23 files +  23     0 ❌ ±    0

Results for commit 6078468. ± Comparison against earlier commit 74debe3.