Whitespace/style changes merged from projects/ipfw.