where appropriate. While here, pet portlint (Makevar order; whitespace). Approved by: portmgr (tier-2 blanket)