And shrink a few too-long lines.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>