Adjust white space and line wraps.  Remove unnecessary parentheses and
braces, unused macros, and some of the more redundant comments.
Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>