More work towards making jenkins like me, PMD-wise