vt: whitespace and style(9) updates
(cherry picked from commit 327da507f9df0eb4ab3b5621c5a38fb90d250e02)