Take #2 at PMD cleanup