minor: tweaks to test clearing PMD warnings