All PDs: Minor whitespace and consistency fixes.