More PMD-induced cleanup.