Witespace and comment changes, and a different way to say i + 1 < end.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>