A round of code polish regarding the PMD and Squid rules referred to in the ticket. Original pull request: #336.