This new version has mostly cosmetic changes that do not affect
benchmark results.

Signed-off-by: Harm Hanemaaijer <fgenfb@yahoo.com>