* Fix upstream whitespace change in the patch. * Minor cleanup to the header. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>